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

List:       kde-commits
Subject:    kdemultimedia/kaboodle
From:       Stephan Kulow <coolo () kde ! org>
Date:       2003-10-15 10:52:46
[Download RAW message or body]

CVS commit by coolo: 

a part and a binary are fine (and work even for non-ELF systems)


  M +17 -19    Makefile.am   1.25


--- kdemultimedia/kaboodle/Makefile.am  #1.24:1.25
@@ -3,37 +3,35 @@
 SUBDIRS = pics actions
 
-lib_LTLIBRARIES = kaboodle.la
-
 kde_module_LTLIBRARIES = libkaboodlepart.la
 
-libkaboodlepart_la_SOURCES = conf.cpp \
+noinst_LTLIBRARIES = libkaboodle_noinst.la
+libkaboodle_noinst_la_SOURCES = conf.cpp \
         controls.cpp \
         engine.cpp \
-        kaboodle_factory.cpp \
         player.cpp \
-        view.cpp
+        view.cpp \
+        kaboodle_factory.cpp
+
+libs = $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde \
-lkmediaplayer  
+libkaboodlepart_la_SOURCES = dummy.cpp
 libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkaboodlepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lqtmcop -lkmedia2_idl \
-lsoundserver_idl -lartskde -lkmediaplayer +libkaboodlepart_la_LIBADD = \
libkaboodle_noinst.la $(libs)  
-kaboodle_la_SOURCES = main.cpp \
+kaboodle_SOURCES = main.cpp \
         kaboodleapp.cpp \
-        userinterface.cpp
+        userinterface.cpp 
 
-kaboodle_la_LIBADD = libkaboodlepart.la
-kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
+dummy.cpp:
+        echo > dummy.cpp
 
-bin_PROGRAMS = kaboodle
+CLEANFILES = dummy.cpp
 
-kaboodle_LDADD = kaboodle.la
+kaboodle_LDADD = libkaboodle_noinst.la $(libs)
 kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kaboodle_SOURCES = dummy.cpp
 
-libkaboodlepart_la_METASOURCES = AUTO
-
-CLEANFILES = dummy.cpp
+bin_PROGRAMS = kaboodle
 
-dummy.cpp:
-        echo > dummy.cpp
+METASOURCES = AUTO
 
 xdg_apps_DATA = kaboodle.desktop
@@ -45,3 +43,3 @@
 
 messages: rc.cpp
-        $(XGETTEXT) rc.cpp *.cpp *.h -o $(podir)/kaboodle.pot
+        $(XGETTEXT) *.cpp *.h -o $(podir)/kaboodle.pot


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