$NetBSD: patch-bi,v 1.3 2001/12/03 15:37:19 skrll Exp $ --- kdesktop/Makefile.in.orig Sat Nov 10 07:58:23 2001 +++ kdesktop/Makefile.in @@ -274,10 +274,12 @@ x_libraries = @x_libraries@ INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes) +libkdesktop_main_la_LDFLAGS = $(all_libraries) -lkdesu +libkdesktop_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la kdesktop_la_LDFLAGS = $(all_libraries) -lkdesu -module -avoid-version -kdesktop_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la +kdesktop_la_LIBADD = libkdesktop_main.la kdesktop_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kdesktop_LDADD = kdesktop.la +kdesktop_LDADD = libkdesktop_main.la SUBDIRS = . pics patterns programs init kwebdesktop @@ -285,14 +287,16 @@ bin_PROGRAMS = kdesktop kdmdesktop bin_SCRIPTS = kdeeject -lib_LTLIBRARIES = kdesktop.la +lib_LTLIBRARIES = libkdesktop_main.la kdesktop.la -#>- kdesktop_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc KDesktopIface.skel bgmanager.cc init.cc KScreensaverIface.skel minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc startupid.cpp +#>- libkdesktop_main_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc KDesktopIface.skel bgmanager.cc init.cc KScreensaverIface.skel minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc startupid.cpp #>+ 1 -kdesktop_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc bgmanager.cc init.cc minicli.cpp pixmapserver.cc kcustommenu.cc startupid.cpp KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc +libkdesktop_main_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc bgmanager.cc init.cc minicli.cpp pixmapserver.cc kcustommenu.cc startupid.cpp KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc -kdesktop_SOURCES = dummy.cc +kdesktop_la_SOURCES = kdesktop_main.cc + +kdesktop_SOURCES = kdesktop_main.cc include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h @@ -324,26 +328,30 @@ LIBS = @LIBS@ X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ -kdesktop_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \ +libkdesktop_main_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \ $(top_builddir)/kcontrol/background/libbgnd.la -#>- kdesktop_la_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo desktop.lo \ -#>- main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo minicli.lo \ -#>- pixmapserver.lo kcustommenu.lo startupid.lo +#>- libkdesktop_main_la_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ +#>- desktop.lo main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo \ +#>- minicli.lo pixmapserver.lo kcustommenu.lo startupid.lo #>+ 7 -kdesktop_la_final_OBJECTS = kdesktop_la.all_cpp.lo kdesktop_la.all_cc.lo -kdesktop_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo desktop.lo \ - main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo minicli.lo \ - pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo \ - kdesktop_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kdesktop_la_OBJECTS = $(kdesktop_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kdesktop_la_OBJECTS = $(kdesktop_la_final_OBJECTS) +libkdesktop_main_la_final_OBJECTS = libkdesktop_main_la.all_cpp.lo libkdesktop_main_la.all_cc.lo +libkdesktop_main_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ + desktop.lo main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo \ + minicli.lo pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo \ + libkdesktop_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_final_OBJECTS) +kdesktop_la_DEPENDENCIES = libkdesktop_main.la +#>- kdesktop_la_OBJECTS = kdesktop_main.lo +#>+ 1 +kdesktop_la_OBJECTS = kdesktop_main.lo bin_PROGRAMS = kdesktop$(EXEEXT) kdmdesktop$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -#>- kdesktop_OBJECTS = dummy.$(OBJEXT) +#>- kdesktop_OBJECTS = kdesktop_main.$(OBJEXT) #>+ 1 -kdesktop_OBJECTS = dummy.$(OBJEXT) -kdesktop_DEPENDENCIES = kdesktop.la +kdesktop_OBJECTS = kdesktop_main.$(OBJEXT) +kdesktop_DEPENDENCIES = libkdesktop_main.la #>- kdmdesktop_OBJECTS = kdmdesktop.$(OBJEXT) #>+ 5 kdmdesktop_final_OBJECTS = kdmdesktop.all_cpp.o kdmdesktop.all_cc.o @@ -375,15 +383,15 @@ #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 DESIGN kcustommenu.h kdiconview.h kdesktopbindings.cpp kdmdesktop.h kdeeject +KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h kdiconview.h kdesktopbindings.cpp kdeeject kdmdesktop.h DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) TAR = tar GZIP_ENV = --best -SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) -OBJECTS = $(kdesktop_la_OBJECTS) $(kdesktop_OBJECTS) $(kdmdesktop_OBJECTS) +SOURCES = $(libkdesktop_main_la_SOURCES) $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) +OBJECTS = $(libkdesktop_main_la_OBJECTS) $(kdesktop_la_OBJECTS) $(kdesktop_OBJECTS) $(kdmdesktop_OBJECTS) #>- all: all-redirect #>+ 1 @@ -470,6 +478,9 @@ maintainer-clean-libtool: +libkdesktop_main.la: $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkdesktop_main_la_LDFLAGS) $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_LIBADD) $(LIBS) + kdesktop.la: $(kdesktop_la_OBJECTS) $(kdesktop_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kdesktop_la_LDFLAGS) $(kdesktop_la_OBJECTS) $(kdesktop_la_LIBADD) $(LIBS) @@ -810,9 +821,6 @@ messages: $(XGETTEXT) *.cc *.cpp *.h -o $(podir)/kdesktop.pot -dummy.cc: - echo > dummy.cc - install-data-local: @test -n "$(DESTDIR)" || test -z "$(PAM)" || $(top_srcdir)/mkpamserv $(PAM) @@ -903,16 +911,16 @@ #>+ 12 -kdesktop_la_meta_unload.cc: lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc - @echo 'creating kdesktop_la_meta_unload.cc' - @-rm -f kdesktop_la_meta_unload.cc +libkdesktop_main_la_meta_unload.cc: lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc + @echo 'creating libkdesktop_main_la_meta_unload.cc' + @-rm -f libkdesktop_main_la_meta_unload.cc @if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kdesktop_la[] = {' > kdesktop_la_meta_unload.cc ;\ - cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kdesktop_la_meta_unload.cc ;\ - echo '0};' >> kdesktop_la_meta_unload.cc ;\ - echo '#include ' >> kdesktop_la_meta_unload.cc ;\ - echo '_UNLOAD(kdesktop_la)' >> kdesktop_la_meta_unload.cc ;\ - else echo > kdesktop_la_meta_unload.cc; fi + echo 'static const char * _metalist_libkdesktop_main_la[] = {' > libkdesktop_main_la_meta_unload.cc ;\ + cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkdesktop_main_la_meta_unload.cc ;\ + echo '0};' >> libkdesktop_main_la_meta_unload.cc ;\ + echo '#include ' >> libkdesktop_main_la_meta_unload.cc ;\ + echo '_UNLOAD(libkdesktop_main_la)' >> libkdesktop_main_la_meta_unload.cc ;\ + else echo > libkdesktop_main_la_meta_unload.cc; fi #>+ 12 @@ -930,26 +938,38 @@ #>+ 3 clean-moc-classes: - -rm -f kdesktop_la_meta_unload.cc kdmdesktop_meta_unload.cc + -rm -f libkdesktop_main_la_meta_unload.cc kdmdesktop_meta_unload.cc #>+ 11 -kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc - @echo 'creating kdesktop_la.all_cpp.cpp ...'; \ - rm -f kdesktop_la.all_cpp.files kdesktop_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cpp.final; \ +libkdesktop_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc + @echo 'creating libkdesktop_main_la.all_cpp.cpp ...'; \ + rm -f libkdesktop_main_la.all_cpp.files libkdesktop_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cpp.final; \ for file in minicli.cpp startupid.cpp ; do \ - echo "#include \"$$file\"" >> kdesktop_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkdesktop_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cpp.final; \ + done; \ + cat libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files > libkdesktop_main_la.all_cpp.cpp; \ + rm -f libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files + +#>+ 11 +libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/lockdlg.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc + @echo 'creating libkdesktop_main_la.all_cc.cc ...'; \ + rm -f libkdesktop_main_la.all_cc.files libkdesktop_main_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cc.final; \ + for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc ; do \ + echo "#include \"$$file\"" >> libkdesktop_main_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cc.final; \ done; \ - cat kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files > kdesktop_la.all_cpp.cpp; \ - rm -f kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files + cat libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files > libkdesktop_main_la.all_cc.cc; \ + rm -f libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files #>+ 11 -kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/lockdlg.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc +kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdesktop_main.cc @echo 'creating kdesktop_la.all_cc.cc ...'; \ rm -f kdesktop_la.all_cc.files kdesktop_la.all_cc.final; \ echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cc.final; \ - for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc ; do \ + for file in kdesktop_main.cc ; do \ echo "#include \"$$file\"" >> kdesktop_la.all_cc.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cc.final; \ done; \ @@ -957,11 +977,11 @@ rm -f kdesktop_la.all_cc.final kdesktop_la.all_cc.files #>+ 11 -kdesktop.all_cc.cc: $(srcdir)/Makefile.in dummy.cc +kdesktop.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdesktop_main.cc @echo 'creating kdesktop.all_cc.cc ...'; \ rm -f kdesktop.all_cc.files kdesktop.all_cc.final; \ echo "#define KDE_USE_FINAL 1" >> kdesktop.all_cc.final; \ - for file in dummy.cc ; do \ + for file in kdesktop_main.cc ; do \ echo "#include \"$$file\"" >> kdesktop.all_cc.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop.all_cc.final; \ done; \ @@ -994,20 +1014,20 @@ #>+ 3 clean-final: - -rm -f kdesktop_la.all_cpp.cpp kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cpp.cpp kdmdesktop.all_cc.cc + -rm -f libkdesktop_main_la.all_cpp.cpp libkdesktop_main_la.all_cc.cc kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cpp.cpp kdmdesktop.all_cc.cc #>+ 2 final: - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" install-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" install-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean