[kmobiletools] branches/extragear/kde3/pim/kmobiletools

[Marco Gulino]

SVN commit 671984 by gulino:

Fixing makefiles.


 M  +1 -1      kbluetoothpairingwizard/Makefile.am  
 M  +1 -1      kmobiletools/Makefile.am  
 M  +1 -1      kmobiletools/libkmobiletools/Makefile.am  
 M  +1 -2      kmobiletools/mainpart/Makefile.am  
 M  +1 -1      kmtsetup/Makefile.am  
 M  +1 -1      tests/kserialdeviceemulator/Makefile.am  


--- branches/extragear/kde3/pim/kmobiletools/kbluetoothpairingwizard/Makefile.am #671983:671984
@@ -25,7 +25,7 @@
 # the application source, library search path, and link libraries
 kbluetoothpairingwizard_SOURCES = main.cpp kbluetoothpairingwizard.cpp \
 		kbluetoothpairingwizardwidgetbase.ui bluedevice.cpp btservice.cpp
-kbluetoothpairingwizard_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kbluetoothpairingwizard_LDFLAGS = $(all_libraries)
 kbluetoothpairingwizard_LDADD = -lkio $(LIB_KDEUI)
 
 # this is where the desktop file will go 
--- branches/extragear/kde3/pim/kmobiletools/kmobiletools/Makefile.am #671983:671984
@@ -25,7 +25,7 @@
 
 # the application source, library search path, and link libraries
 kmobiletools_SOURCES = main.cpp kmobiletools.cpp
-kmobiletools_LDFLAGS = $(KDE_RPATH) $(all_libraries) 
+kmobiletools_LDFLAGS = $(all_libraries) 
 kmobiletools_LDADD = $(LIB_KHTML) $(LIB_KPARTS) \
 	libkmobiletools/libkmobiletools.la
 
--- branches/extragear/kde3/pim/kmobiletools/kmobiletools/libkmobiletools/Makefile.am #671983:671984
@@ -5,7 +5,7 @@
 METASOURCES = AUTO
 lib_LTLIBRARIES = libkmobiletools.la
 libkmobiletools_la_LDFLAGS = -avoid-version -no-undefined \
-	$(all_libraries) $(KDE_RPATH)
+	$(all_libraries) 
 #libkmobiletools_la_LIBADD = $(LIB_KHTML)
 libkmobiletools_la_SOURCES = aboutdata.cpp calendar.cpp contactptrlist.cpp \
 	crashhandler.cpp deviceIFace.skel deviceIFace.stub devicemenu.cpp encodingshelper.cpp \
--- branches/extragear/kde3/pim/kmobiletools/kmobiletools/mainpart/Makefile.am #671983:671984
@@ -10,8 +10,7 @@
 noinst_HEADERS = bluemonitor.h bluetoothitems.h deviceconfigdialog.h \
 	devicemanager.h kmobiletools_mainpart.h newdevicewizard.h
 
-libkmobiletoolsmainpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) \
-	$(KDE_RPATH)
+libkmobiletoolsmainpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 libkmobiletoolsmainpart_la_SOURCES = bluemonitor.cpp bluetoothitems.cpp \
 	cfg_at-engine.ui cfg_filesystem.ui cfg_gammu-engine.ui deviceList.ui \
 	deviceconfigdialog.cpp devicemanager.cpp genericDeviceOptions.ui kmobiletools_mainpart.cpp \
--- branches/extragear/kde3/pim/kmobiletools/kmtsetup/Makefile.am #671983:671984
@@ -25,7 +25,7 @@
 # the application source, library search path, and link libraries
 kmtsetup_SOURCES = main.cpp kmtsetupwidget.cpp kmtsetupwidgetbase.ui
 
-kmtsetup_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kmtsetup_LDFLAGS = $(all_libraries)
 kmtsetup_LDADD = -lkio $(LIB_KDEUI)
 
 # this is where the desktop file will go 
--- branches/extragear/kde3/pim/kmobiletools/tests/kserialdeviceemulator/Makefile.am #671983:671984
@@ -23,7 +23,7 @@
 # the application source, library search path, and link libraries
 kserialdeviceemulator_SOURCES = main.cpp kserialdeviceemulator.cpp \
 	kserialdeviceemulatorwidget.cpp kserialdeviceemulatorwidgetbase.ui commandslist.cpp
-kserialdeviceemulator_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kserialdeviceemulator_LDFLAGS = $(all_libraries)
 kserialdeviceemulator_LDADD = ../../kmobiletools/libkmobiletools/libkmobiletools.la $(LIB_KDEUI)
 
 # this is where the desktop file will go