diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-01-02 22:25:48 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-01-02 22:25:48 +0000 |
| commit | 36d7821740208b486c2a2e02ee29f5ced494e5c3 (patch) | |
| tree | c8a42d8fc5aa7fb54bdf8819c789afbc2259ffeb /kio/misc | |
| parent | d7b9791584eda0f022813fd2b2df50f59eba29c5 (diff) | |
| download | tdelibs-36d7821740208b486c2a2e02ee29f5ced494e5c3.tar.gz tdelibs-36d7821740208b486c2a2e02ee29f5ced494e5c3.zip | |
Final automake fixes; compilation now succeeds under Ubuntu Karmic
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1069187 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kio/misc')
| -rw-r--r-- | kio/misc/kpac/Makefile.am | 3 | ||||
| -rw-r--r-- | kio/misc/kssld/Makefile.am | 2 | ||||
| -rw-r--r-- | kio/misc/kwalletd/Makefile.am | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/kio/misc/kpac/Makefile.am b/kio/misc/kpac/Makefile.am index 33d7d0196..796a9771c 100644 --- a/kio/misc/kpac/Makefile.am +++ b/kio/misc/kpac/Makefile.am @@ -11,8 +11,7 @@ kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \ downloader.cpp discovery.cpp kded_proxyscout_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_proxyscout_la_LIBADD = $(LIB_KIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED) $(LIB_QT) \ - $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kded/libkdeinit_kded.la \ - $(LIB_KDECORE) $(LIBRESOLV) + $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIBRESOLV) kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE) diff --git a/kio/misc/kssld/Makefile.am b/kio/misc/kssld/Makefile.am index 24faf2e28..a87478d65 100644 --- a/kio/misc/kssld/Makefile.am +++ b/kio/misc/kssld/Makefile.am @@ -21,7 +21,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(SSL_INCLUDES) -I$(top_srcdir)/kio/kss kde_module_LTLIBRARIES = kded_kssld.la kded_kssld_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_kssld_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kded/libkdeinit_kded.la $(LIB_KDECORE) +kded_kssld_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) kded_kssld_la_SOURCES = kssld.cpp kssld.skel METASOURCES = AUTO diff --git a/kio/misc/kwalletd/Makefile.am b/kio/misc/kwalletd/Makefile.am index 1c198c46e..6876ba596 100644 --- a/kio/misc/kwalletd/Makefile.am +++ b/kio/misc/kwalletd/Makefile.am @@ -21,7 +21,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/kwallet/backend -I$(top kde_module_LTLIBRARIES = kded_kwalletd.la kded_kwalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/kded/libkdeinit_kded.la +kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KDEUI) kded_kwalletd_la_SOURCES = kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui kbetterthankdialogbase.ui METASOURCES = AUTO |