From kde-commits  Sat Feb 28 17:09:33 2004
From: Dominique Devriese <devriese () kde ! org>
Date: Sat, 28 Feb 2004 17:09:33 +0000
To: kde-commits
Subject: kdemultimedia/kmid
Message-Id: <20040228170933.9034A995A () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=107798818724860

CVS commit by domi: 

Forward port:

Creates a library libkmidlib.la against which kmid and libkmidpart.la
both link.  This fixes the current situation where kmid links against
its own part, which leads to problems relating to install locations
and rpathing in the Debian packages.


  M +1 -0      .cvsignore   1.8
  M +12 -3     Makefile.am   1.59


--- kdemultimedia/kmid/.cvsignore  #1.7:1.8
@@ -7,2 +7,3 @@
 kmidIface_skel.cc
 kmidIface_skel.cpp
+part_dummy.cpp

--- kdemultimedia/kmid/Makefile.am  #1.58:1.59
@@ -2,9 +2,13 @@
 
 kde_module_LTLIBRARIES = libkmidpart.la
+lib_LTLIBRARIES = libkmidlib.la
+
+libkmidlib_la_LDFLAGS = $(all_libraries)
+libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid
 
 libkmidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-libkmidpart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid
+libkmidpart_la_LIBADD = libkmidlib.la
 
-libkmidpart_la_SOURCES = kmidframe.cpp kmidclient.cpp kdisptext.cpp \
+libkmidlib_la_SOURCES = kmidframe.cpp kmidclient.cpp kdisptext.cpp \
         qslidertime.cpp klcdnumber.cpp ktrianglebutton.cpp \
         midicfgdlg.cpp collectdlg.cpp randomlist.cpp \
@@ -13,4 +17,9 @@
         songlist.cpp slman.cpp kmid_part.cpp kmidIface.skel
 
+libkmidpart_la_SOURCES = part_dummy.cpp
+
+part_dummy.cpp:
+        touch part_dummy.cpp
+
 noinst_HEADERS = kmidframe.h kmidclient.h kdisptext.h \
         qslidertime.h klcdnumber.h ktrianglebutton.h \
@@ -22,5 +31,5 @@
 kmid_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 kmid_SOURCES = main.cpp
-kmid_LDADD   = libkmidpart.la
+kmid_LDADD   = libkmidlib.la
 
 bin_PROGRAMS = kmid