diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:31:45 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:31:45 -0600 |
| commit | bcd8b9bb109e7bbaab3ee46a96fb83d400ae0ea6 (patch) | |
| tree | 0296a0267e6e7d3308fb510ffbd307f0135d1287 /tdehtml | |
| parent | ca26eb5709d1fd76f263b2c82adfc8bcaafd9086 (diff) | |
| download | tdelibs-bcd8b9bb109e7bbaab3ee46a96fb83d400ae0ea6.tar.gz tdelibs-bcd8b9bb109e7bbaab3ee46a96fb83d400ae0ea6.zip | |
Rename a few build variables for overall consistency
Diffstat (limited to 'tdehtml')
| -rw-r--r-- | tdehtml/Makefile.am | 2 | ||||
| -rw-r--r-- | tdehtml/java/Makefile.am | 2 | ||||
| -rw-r--r-- | tdehtml/tdemultipart/Makefile.am | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tdehtml/Makefile.am b/tdehtml/Makefile.am index 924b3db27..2143fd90a 100644 --- a/tdehtml/Makefile.am +++ b/tdehtml/Makefile.am @@ -57,7 +57,7 @@ libtdehtml_la_LIBADD = ./xml/libtdehtmlxml.la ./html/libtdehtmlhtml.la \ $(LIBTHAI) \ $(top_builddir)/tdeprint/libtdeprint.la \ $(top_builddir)/tdeutils/libtdeutils.la \ - $(top_builddir)/tdewallet/client/libtdewalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11) + $(top_builddir)/tdewallet/client/libtdewalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11) # init_libtdehtml is in libtdehtml.so; init_libtdehtmlpart needs to be in the part dummy.cpp: $(srcdir)/Makefile.am diff --git a/tdehtml/java/Makefile.am b/tdehtml/java/Makefile.am index 00eeca230..2ae3cec13 100644 --- a/tdehtml/java/Makefile.am +++ b/tdehtml/java/Makefile.am @@ -32,6 +32,6 @@ kjavaappletviewer_la_SOURCES= kjavaapplet.cpp kjavaappletcontext.cpp \ kjavadownloader.cpp kjavaappletviewer.cpp kjavaappletviewer_la_LDFLAGS= $(all_libraries) -module $(KDE_PLUGIN) -kjavaappletviewer_la_LIBADD= $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la +kjavaappletviewer_la_LIBADD= $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la kde_services_DATA= kjavaappletviewer.desktop diff --git a/tdehtml/tdemultipart/Makefile.am b/tdehtml/tdemultipart/Makefile.am index f2e119c3f..ae33efd01 100644 --- a/tdehtml/tdemultipart/Makefile.am +++ b/tdehtml/tdemultipart/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeio/httpfilter -I$(top_srcd kde_module_LTLIBRARIES = libtdemultipart.la libtdemultipart_la_SOURCES = tdemultipart.cpp -libtdemultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIBZ) +libtdemultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIBZ) libtdemultipart_la_DEPENDENCIES = $(LIB_KPARTS) libtdemultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) |