[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/utils/workflow
From:       Thomas Kadauke <tkadauke () gmx ! de>
Date:       2006-07-07 19:21:54
Message-ID: 1152300114.917351.26197.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 559618 by tkadauke:

buildsystem cleanup (Final Part). now everything builds without having 
to install in the middle of the process. You can't imagine how close I 
was to destoying my computer in the most violent way possible because of 
that problem.


 M  +1 -1      configure.in.in  
 M  +1 -1      src/Makefile.am  
 M  +4 -4      src/commands/Makefile.am  
 M  +3 -2      src/commands/file/Makefile.am  
 M  +4 -4      src/commands/image/Makefile.am  
 M  +3 -2      src/commands/text/Makefile.am  
 M  +6 -4      src/ui/plugin/Makefile.am  


--- trunk/playground/utils/workflow/configure.in.in #559617:559618
@@ -11,4 +11,4 @@
 if test "x$X" = "x"; then
         echo "UIC does not support -L option!!";
 fi
-UIC=`echo $UIC -L \$\(top_builddir\)/src/widgets/plugin/.libs`
+UIC=`echo LD_LIBRARY_PATH=\$\(top_builddir\)/src/ui/widgets/.libs:\$\(top_builddir\)/src/core/.libs \
                $UIC -L \$\(top_builddir\)/src/ui/plugin/.libs`
--- trunk/playground/utils/workflow/src/Makefile.am #559617:559618
@@ -41,7 +41,7 @@
 # this is where the XML-GUI resource file goes
 rcdir = $(kde_datadir)/workflow
 rc_DATA = workflowui.rc
-SUBDIRS = core ui widgets commands sdk
+SUBDIRS = core ui commands sdk
 
 servicetypedir = $(kde_servicetypesdir)
 servicetype_DATA = workflow_library.desktop
--- trunk/playground/utils/workflow/src/commands/Makefile.am #559617:559618
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/src/core -I$(top_srcdir)/src/ui \
-	-I$(top_srcdir)/src/widgets $(all_includes)
+INCLUDES = -I$(top_srcdir)/src/core -I$(top_srcdir)/src/ui/widgets \
+	$(all_includes)
 METASOURCES = AUTO
 noinst_HEADERS = standardlibrary.h showmessagewidget.h showmessagecommand.h \
 	shellexecutewidget.h shellexecutecommand.h listcountcommand.h listreversecommand.h \
\ @@ -24,8 +24,8 @@
 	waitcommand.cpp storeinvariablewidget.cpp storeinvariablecommand.cpp \
 	loadfromvariablewidget.cpp selectvariabledialog.cpp loadfromvariablecommand.cpp
 kde_services_DATA = workflow_stdcommands.desktop
-libworkflow_stdcommands_la_LIBADD =\
-	$(top_builddir)/src/widgets/libworkflowwidgets.la
+libworkflow_stdcommands_la_LIBADD = \
+	$(top_builddir)/src/ui/widgets/libworkflowwidgets.la \
$(top_builddir)/src/core/libworkflowcore.la  command_xmldir = \
$(kde_datadir)/workflow/libraries  command_xml_DATA = libworkflow_stdcommands.wflib
 SUBDIRS = image file text
--- trunk/playground/utils/workflow/src/commands/file/Makefile.am #559617:559618
@@ -1,4 +1,5 @@
-INCLUDES = -I$(top_srcdir)/src/core -I$(top_srcdir)/src/ui \
-I$(top_srcdir)/src/widgets $(all_includes) +INCLUDES = -I$(top_srcdir)/src/core \
-I$(top_srcdir)/src/ui/widgets \ +	$(all_includes)
 METASOURCES = AUTO
 kde_module_LTLIBRARIES = libworkflow_filecommands.la
 libworkflow_filecommands_la_LDFLAGS = -module $(all_libraries)
@@ -8,7 +9,7 @@
 	listfoldercontentscommand.h
 kde_services_DATA = workflow_filecommands.desktop
 libworkflow_filecommands_la_LIBADD = \
-	$(top_builddir)/src/widgets/libworkflowwidgets.la \
$(top_builddir)/src/core/libworkflowcore.la $(LIB_KFILE) \
+	$(top_builddir)/src/ui/widgets/libworkflowwidgets.la \
$(top_builddir)/src/core/libworkflowcore.la $(LIB_KFILE)  
 command_xmldir = $(kde_datadir)/workflow/libraries
 command_xml_DATA = libworkflow_filecommands.wflib
--- trunk/playground/utils/workflow/src/commands/image/Makefile.am #559617:559618
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/src/core -I$(top_srcdir)/src/ui \
-	-I$(top_srcdir)/src/widgets $(all_includes)
+INCLUDES = -I$(top_srcdir)/src/core -I$(top_srcdir)/src/ui/widgets \
+	$(all_includes)
 METASOURCES = AUTO
 kde_module_LTLIBRARIES = libworkflow_imagecommands.la
 libworkflow_imagecommands_la_LDFLAGS = -module $(all_libraries)
@@ -13,8 +13,8 @@
 	rotateimagedialogbase.ui rotateimagedialog.cpp
 
 kde_services_DATA = workflow_imagecommands.desktop
-libworkflow_imagecommands_la_LIBADD =\
-	$(top_builddir)/src/widgets/libworkflowwidgets.la
+libworkflow_imagecommands_la_LIBADD = \
+	$(top_builddir)/src/ui/widgets/libworkflowwidgets.la \
$(top_builddir)/src/core/libworkflowcore.la  
 command_xmldir = $(kde_datadir)/workflow/libraries
 command_xml_DATA = libworkflow_imagecommands.wflib
--- trunk/playground/utils/workflow/src/commands/text/Makefile.am #559617:559618
@@ -1,4 +1,5 @@
-INCLUDES = -I$(top_srcdir)/src/core -I$(top_srcdir)/src/ui \
-I$(top_srcdir)/src/widgets $(all_includes) +INCLUDES = -I$(top_srcdir)/src/core \
-I$(top_srcdir)/src/ui/widgets \ +	$(all_includes)
 METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = libworkflow_textcommands.la
@@ -8,7 +9,7 @@
 	getstringwidget.h
 kde_services_DATA = workflow_textcommands.desktop
 libworkflow_textcommands_la_LIBADD = \
-	$(top_builddir)/src/widgets/libworkflowwidgets.la \
$(top_builddir)/src/core/libworkflowcore.la $(LIB_KFILE) \
+	$(top_builddir)/src/ui/widgets/libworkflowwidgets.la \
$(top_builddir)/src/core/libworkflowcore.la $(LIB_KFILE)  
 command_xmldir = $(kde_datadir)/workflow/libraries
 command_xml_DATA = libworkflow_textcommands.wflib
--- trunk/playground/utils/workflow/src/ui/plugin/Makefile.am #559617:559618
@@ -1,11 +1,13 @@
-INCLUDES = -I$(top_srcdir)/src/core -I$(top_srcdir)/src/widgets $(all_includes)
+INCLUDES = -I$(top_srcdir)/src/core -I$(top_srcdir)/src/ui/widgets \
+	-I$(top_srcdir)/src/widgets $(all_includes)
 METASOURCES = AUTO
 
+AM_CXXFLAGS = -DQT_PLUGIN
 kde_widget_LTLIBRARIES = libworkflowplugin.la
 libworkflowplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libworkflowplugin_la_LIBADD = $(top_builddir)/src/widgets/libworkflowwidgets.la \
-	$(top_builddir)/src/core/libworkflowcore.la $(LIB_KIO)
-libworkflowplugin_la_SOURCES = workflowwidgets.cpp workflow.widgets
+libworkflowplugin_la_LIBADD = \
+	$(top_builddir)/src/ui/widgets/libworkflowwidgets.la $(LIB_KIO)
+libworkflowplugin_la_SOURCES = workflowwidgets.cpp
 
 workflowwidgets.cpp: $(srcdir)/workflow.widgets
 	makekdewidgets -o workflowwidgets.cpp $(srcdir)/workflow.widgets


[prev in list] [next in list] [prev in thread] [next in thread]