kdemultimedia/arts/tools

[Arnold Krille]

CVS commit by akrille: 

If we take the headers of the actual version, we shouldn't link against older (installed) versions of the libs...

CCMAIL:kde-multimedia at mail.kde.org


  M +22 -5     Makefile.am   1.28
  M +1 -1      main.cpp   1.40


--- kdemultimedia/arts/tools/Makefile.am  #1.27:1.28
@@ -1,4 +1,5 @@
 INCLUDES = \
-        -I$(srcdir)/../gui/kde -I../gui/common \
+        -I$(top_srcdir)/arts/gui/kde \
+        -I$(top_builddir)/arts/gui/common \
         -I$(top_builddir)/arts/modules \
         -I$(top_builddir)/arts/modules/common \
@@ -6,5 +7,8 @@
         -I$(top_builddir)/arts/modules/mixers \
         -I$(top_builddir)/arts/modules/effects \
-        -I$(kde_includes)/arts $(all_includes)
+        -I$(top_builddir)/arts/midi \
+        -I$(kde_includes)/arts \
+        $(all_includes)
+
 
 lib_LTLIBRARIES = libartscontrolsupport.la libartscontrolapplet.la
@@ -29,7 +33,20 @@
 libartscontrolsupport_la_LDFLAGS = $(all_libraries) -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) -no-undefined -module
 
-libartscontrolapplet_la_LIBADD = -lartsflow -lartsflow_idl -lmcop -lqtmcop $(LIBDL) -lsoundserver_idl -lartskde -lartsgui_idl -lartsgui_kde -lartsmodules $(LIB_KDEUI) ./libartscontrolsupport.la
-
-libartscontrolsupport_la_LIBADD = -lartsflow -lartsflow_idl -lmcop -lqtmcop $(LIBDL) -lsoundserver_idl -lartskde -lartsgui_idl -lartsgui_kde -lartsmodules $(LIB_KDEUI)
+libartscontrolapplet_la_LIBADD = \
+        -lartsflow -lartsflow_idl -lmcop -lqtmcop $(LIBDL) -lsoundserver_idl -lartskde \
+        $(LIB_KDEUI) ./libartscontrolsupport.la
+#libartscontrolapplet_la_LIBADD = \
+#       -lartsflow -lartsflow_idl -lmcop -lqtmcop $(LIBDL) -lsoundserver_idl -lartskde \
+#       $(top_builddir)/arts/gui/common/libartsgui_idl.la \
+#       $(top_builddir)/arts/gui/kde/libartsgui_kde.la \
+#       $(top_builddir)/arts/modules/libartsmodules.la \
+#       $(LIB_KDEUI) ./libartscontrolsupport.la
+
+libartscontrolsupport_la_LIBADD = \
+        -lartsflow -lartsflow_idl -lmcop -lqtmcop $(LIBDL) -lsoundserver_idl -lartskde \
+        $(top_builddir)/arts/gui/common/libartsgui_idl.la \
+        $(top_builddir)/arts/gui/kde/libartsgui_kde.la \
+        $(top_builddir)/arts/modules/libartsmodules.la \
+        $(LIB_KDEUI)
 
 #artscontrol_la_SOURCES = main.cpp \

--- kdemultimedia/arts/tools/main.cpp  #1.39:1.40
@@ -50,5 +50,5 @@
 #include <map>
 
-#include <arts/kartswidget.h>
+#include "kartswidget.h"
 
 using namespace std;