diff options
Diffstat (limited to 'tdehtml')
-rw-r--r-- | tdehtml/Makefile.am | 6 | ||||
-rw-r--r-- | tdehtml/java/Makefile.am | 2 | ||||
-rw-r--r-- | tdehtml/tdemultipart/Makefile.am | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tdehtml/Makefile.am b/tdehtml/Makefile.am index fc8b80e16..431b0b143 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_TDEFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11) + $(top_builddir)/tdewallet/client/libtdewalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_TDEUI) $(LIB_TQT) $(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 @@ -67,7 +67,7 @@ dummy.cpp: $(srcdir)/Makefile.am libtdehtmlpart_la_SOURCES = dummy.cpp libtdehtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) -libtdehtmlpart_la_LIBADD = libtdehtml.la $(LIB_QT) +libtdehtmlpart_la_LIBADD = libtdehtml.la $(LIB_TQT) # init_tdehtmlimagefactory is in libtdehtml.so; init_tdehtmlimagepart needs to be in the part imgdummy.cpp: $(srcdir)/Makefile.am @@ -77,7 +77,7 @@ imgdummy.cpp: $(srcdir)/Makefile.am tdehtmlimagepart_la_SOURCES = imgdummy.cpp tdehtmlimagepart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) -tdehtmlimagepart_la_LIBADD = libtdehtml.la $(LIB_QT) +tdehtmlimagepart_la_LIBADD = libtdehtml.la $(LIB_TQT) INCLUDES = -I$(top_srcdir)/kjs -I$(top_builddir)/kjs -I$(top_srcdir)/kimgio \ -I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \ diff --git a/tdehtml/java/Makefile.am b/tdehtml/java/Makefile.am index c1dd3136f..9f83f5a74 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_TDEPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la +kjavaappletviewer_la_LIBADD= $(LIB_TDEPARTS) $(LIB_TQT) $(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 440323119..427a15a45 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_TDEPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIBZ) +libtdemultipart_la_LIBADD = $(LIB_TDEPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIBZ) libtdemultipart_la_DEPENDENCIES = $(LIB_TDEPARTS) libtdemultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) |