diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:46 -0600 |
| commit | 48087e1d5650499b6093a6816356d467c8461802 (patch) | |
| tree | 00c39f978492596620df1374e8a91af507d8bac3 /filesharing | |
| parent | ccfaeb9b831a41e93e777b041cdf33a7d40a0e0b (diff) | |
| download | tdenetwork-48087e1d5650499b6093a6816356d467c8461802.tar.gz tdenetwork-48087e1d5650499b6093a6816356d467c8461802.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'filesharing')
| -rw-r--r-- | filesharing/advanced/kcm_sambaconf/Makefile.am | 2 | ||||
| -rw-r--r-- | filesharing/advanced/propsdlgplugin/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/filesharing/advanced/kcm_sambaconf/Makefile.am b/filesharing/advanced/kcm_sambaconf/Makefile.am index 74a8d9b8..c4c0d787 100644 --- a/filesharing/advanced/kcm_sambaconf/Makefile.am +++ b/filesharing/advanced/kcm_sambaconf/Makefile.am @@ -18,7 +18,7 @@ kcm_kcmsambaconf_la_LIBADD = \ -ltdeprint \ libfilesharesamba.la -kcm_kcmsambaconf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kcmsambaconf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor libfilesharesamba_la_SOURCES = \ sambafile.cpp \ diff --git a/filesharing/advanced/propsdlgplugin/Makefile.am b/filesharing/advanced/propsdlgplugin/Makefile.am index a639d725..7c6b74c4 100644 --- a/filesharing/advanced/propsdlgplugin/Makefile.am +++ b/filesharing/advanced/propsdlgplugin/Makefile.am @@ -17,7 +17,7 @@ fileshare_propsdlgplugin_la_LIBADD = \ ../kcm_sambaconf/libfilesharesamba.la \ $(LIB_KIO) -fileshare_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +fileshare_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor AM_CPPFLAGS = -I../kcm_sambaconf $(all_includes) |