CVS commit by coolo: fixing HEAD M +4 -3 Makefile.am 1.234 M +1 -1 preloader/Makefile.am 1.5 --- kdebase/konqueror/Makefile.am #1.233:1.234 @@ -9,4 +9,5 @@ kdeinit_LTLIBRARIES = konqueror.la +noinst_LTLIBRARIES = libkonqueror_intern.la konqdatadir = $(kde_datadir)/konqueror konqdata_DATA = konqueror.rc konq-simplebrowser.rc @@ -21,4 +22,5 @@ include_HEADERS = KonquerorIface.h +libkonqueror_intern_la_SOURCES = konq_settingsxt.kcfgc konqueror_la_SOURCES = konq_main.cc \ KonquerorIface.cc KonquerorIface.skel \ @@ -37,6 +39,5 @@ delayedinitializer.cc \ konq_mainwindow.cc \ - konq_extensionmanager.cc \ - konq_settingsxt.kcfgc + konq_extensionmanager.cc konqueror_la_PCH = AUTO @@ -49,5 +50,5 @@ konqueror_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -konqueror_la_LIBADD = ../libkonq/libkonq.la $(LIBMALLOC) $(LIB_KUTILS) +konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la $(LIBMALLOC) $(LIB_KUTILS) # Hmm, this experiment of a static konq failed, don't trust it... --- kdebase/konqueror/preloader/Makefile.am #1.4:1.5 @@ -6,5 +6,5 @@ kded_konqy_preloader_la_SOURCES = preloader.cc preloader.skel kded_konqy_preloader_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_konqy_preloader_la_LIBADD = $(LIB_KSYCOCA) +kded_konqy_preloader_la_LIBADD = ../libkonqueror_intern.la $(LIB_KSYCOCA) METASOURCES = AUTO