$NetBSD: patch-bz,v 1.6 2003/04/01 12:27:12 markd Exp $ --- klipper/Makefile.in.orig Fri Jan 17 09:03:09 2003 +++ klipper/Makefile.in @@ -287,27 +287,29 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = klipper -lib_LTLIBRARIES = klipper.la +lib_LTLIBRARIES = libklipper_main.la klipper.la kde_module_LTLIBRARIES = klipper_panelapplet.la -CLEANFILES = dummy.cpp - -klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -#>- klipper_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp \ +libklipper_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +#>- libklipper_main_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp \ #>- toplevel.skel #>+ 2 -klipper_la_SOURCES=main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp \ +libklipper_main_la_SOURCES=main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp \ toplevel_skel.cpp -#>- klipper_la_METASOURCES = AUTO +#>- libklipper_main_la_METASOURCES = AUTO +libklipper_main_la_LDFLAGS = $(all_libraries) + +klipper_la_LIBADD = libklipper_main.la +klipper_la_SOURCES = klipper_main.cpp klipper_la_LDFLAGS = $(all_libraries) -module -avoid-version -klipper_LDADD = klipper.la $(LIB_KSYCOCA) -klipper_SOURCES = dummy.cpp +klipper_LDADD = libklipper_main.la +klipper_SOURCES = klipper_main.cpp klipper_LDFLAGS = $(all_libraries) $(KDE_RPATH) -klipper_panelapplet_la_LIBADD = klipper.la +klipper_panelapplet_la_LIBADD = libklipper_main.la #>- klipper_panelapplet_la_SOURCES = applet.cpp applet.skel #>+ 1 klipper_panelapplet_la_SOURCES=applet.cpp applet_skel.cpp @@ -333,17 +335,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) -klipper_la_DEPENDENCIES = -am_klipper_la_OBJECTS = main.lo toplevel.lo urlgrabber.lo \ - configdialog.lo +klipper_la_DEPENDENCIES = libklipper_main.la +am_klipper_la_OBJECTS = klipper_main.lo #>- klipper_la_OBJECTS = $(am_klipper_la_OBJECTS) -#>+ 5 -klipper_la_final_OBJECTS = klipper_la.all_cpp.lo -klipper_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo \ - configdialog.lo toplevel_skel.lo -@KDE_USE_FINAL_FALSE@klipper_la_OBJECTS = $(klipper_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@klipper_la_OBJECTS = $(klipper_la_final_OBJECTS) -klipper_panelapplet_la_DEPENDENCIES = klipper.la +#>+ 1 +klipper_la_OBJECTS = klipper_main.lo +klipper_panelapplet_la_DEPENDENCIES = libklipper_main.la am_klipper_panelapplet_la_OBJECTS = applet.lo #>- klipper_panelapplet_la_OBJECTS = $(am_klipper_panelapplet_la_OBJECTS) #>+ 4 @@ -351,14 +348,24 @@ klipper_panelapplet_la_final_OBJECTS = k klipper_panelapplet_la_nofinal_OBJECTS = applet.lo applet_skel.lo @KDE_USE_FINAL_FALSE@klipper_panelapplet_la_OBJECTS = $(klipper_panelapplet_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@klipper_panelapplet_la_OBJECTS = $(klipper_panelapplet_la_final_OBJECTS) +libklipper_main_la_DEPENDENCIES = +am_libklipper_main_la_OBJECTS = main.lo toplevel.lo urlgrabber.lo \ + configdialog.lo +#>- libklipper_main_la_OBJECTS = $(am_libklipper_main_la_OBJECTS) +#>+ 5 +libklipper_main_la_final_OBJECTS = libklipper_main_la.all_cpp.lo +libklipper_main_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo \ + configdialog.lo toplevel_skel.lo +@KDE_USE_FINAL_FALSE@libklipper_main_la_OBJECTS = $(libklipper_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libklipper_main_la_OBJECTS = $(libklipper_main_la_final_OBJECTS) bin_PROGRAMS = klipper$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_klipper_OBJECTS = dummy.$(OBJEXT) +am_klipper_OBJECTS = klipper_main.$(OBJEXT) #>- klipper_OBJECTS = $(am_klipper_OBJECTS) #>+ 1 -klipper_OBJECTS = dummy.$(OBJEXT) -klipper_DEPENDENCIES = klipper.la +klipper_OBJECTS = klipper_main.$(OBJEXT) +klipper_DEPENDENCIES = libklipper_main.la DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -368,18 +375,21 @@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/applet.Plo \ -#>- @AMDEP_TRUE@ ./$(DEPDIR)/configdialog.Plo ./$(DEPDIR)/dummy.Po \ -#>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/toplevel.Plo \ -#>- @AMDEP_TRUE@ ./$(DEPDIR)/urlgrabber.Plo -#>+ 9 -@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/applet_skel.P $(DEPDIR)/klipper_la.all_cpp.P $(DEPDIR)/klipper_panelapplet_la.all_cpp.P ./$(DEPDIR)/applet.Plo \ -@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/configdialog.Plo ./$(DEPDIR)/dummy.Po \ -@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/toplevel.Plo \ -@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/urlgrabber.Plo -@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/applet_skel.P ./$(DEPDIR)/applet.Plo \ -@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/configdialog.Plo ./$(DEPDIR)/dummy.Po \ -@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/toplevel.Plo \ -@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/urlgrabber.Plo +#>- @AMDEP_TRUE@ ./$(DEPDIR)/configdialog.Plo \ +#>- @AMDEP_TRUE@ ./$(DEPDIR)/klipper_main.Plo \ +#>- @AMDEP_TRUE@ ./$(DEPDIR)/klipper_main.Po ./$(DEPDIR)/main.Plo \ +#>- @AMDEP_TRUE@ ./$(DEPDIR)/toplevel.Plo ./$(DEPDIR)/urlgrabber.Plo +#>+ 11 +@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/applet_skel.P $(DEPDIR)/toplevel_skel.P $(DEPDIR)/klipper_panelapplet_la.all_cpp.P $(DEPDIR)/libklipper_main_la.all_cpp.P ./$(DEPDIR)/applet.Plo \ +@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/configdialog.Plo \ +@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klipper_main.Plo \ +@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klipper_main.Po ./$(DEPDIR)/main.Plo \ +@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/toplevel.Plo ./$(DEPDIR)/urlgrabber.Plo +@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/applet_skel.P $(DEPDIR)/toplevel_skel.P ./$(DEPDIR)/applet.Plo \ +@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/configdialog.Plo \ +@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klipper_main.Plo \ +@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klipper_main.Po ./$(DEPDIR)/main.Plo \ +@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/toplevel.Plo ./$(DEPDIR)/urlgrabber.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -401,11 +411,11 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) \ - $(klipper_SOURCES) + $(libklipper_main_la_SOURCES) $(klipper_SOURCES) DATA = $(appl_DATA) $(apps_DATA) $(autostart_DATA) $(update_DATA) DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) $(klipper_SOURCES) +SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) $(libklipper_main_la_SOURCES) $(klipper_SOURCES) #>- all: all-am #>+ 1 @@ -482,6 +492,8 @@ klipper.la: $(klipper_la_OBJECTS) $(klip $(CXXLINK) -rpath $(libdir) $(klipper_la_LDFLAGS) $(klipper_la_OBJECTS) $(klipper_la_LIBADD) $(LIBS) klipper_panelapplet.la: $(klipper_panelapplet_la_OBJECTS) $(klipper_panelapplet_la_DEPENDENCIES) $(CXXLINK) -rpath $(kde_moduledir) $(klipper_panelapplet_la_LDFLAGS) $(klipper_panelapplet_la_OBJECTS) $(klipper_panelapplet_la_LIBADD) $(LIBS) +libklipper_main.la: $(libklipper_main_la_OBJECTS) $(libklipper_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libklipper_main_la_LDFLAGS) $(libklipper_main_la_OBJECTS) $(libklipper_main_la_LIBADD) $(LIBS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @@ -523,7 +535,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/applet.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configdialog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klipper_main.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klipper_main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toplevel.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/urlgrabber.Plo@am__quote@ @@ -724,7 +737,6 @@ install-strip: mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) @@ -825,16 +837,18 @@ dummy.cpp: .NOEXPORT: #>+ 5 +applet.kidl: $(srcdir)/applet.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/applet.h > applet.kidl || ( rm -f applet.kidl ; /bin/false ) +applet_skel.cpp: applet.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub applet.kidl + +#>+ 5 toplevel.kidl: $(srcdir)/toplevel.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/toplevel.h > toplevel.kidl || ( rm -f toplevel.kidl ; /bin/false ) toplevel_skel.cpp: toplevel.kidl $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub toplevel.kidl #>+ 3 -configdialog.moc: $(srcdir)/configdialog.h - $(MOC) $(srcdir)/configdialog.h -o configdialog.moc - -#>+ 3 urlgrabber.moc: $(srcdir)/urlgrabber.h $(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc @@ -846,21 +860,19 @@ toplevel.moc: $(srcdir)/toplevel.h applet.moc: $(srcdir)/applet.h $(MOC) $(srcdir)/applet.h -o applet.moc -#>+ 5 -applet.kidl: $(srcdir)/applet.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/applet.h > applet.kidl || ( rm -f applet.kidl ; /bin/false ) -applet_skel.cpp: applet.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub applet.kidl +#>+ 3 +configdialog.moc: $(srcdir)/configdialog.h + $(MOC) $(srcdir)/configdialog.h -o configdialog.moc #>+ 3 clean-metasources: - -rm -f configdialog.moc urlgrabber.moc toplevel.moc applet.moc + -rm -f urlgrabber.moc toplevel.moc applet.moc configdialog.moc #>+ 5 clean-idl: -rm -f \ - toplevel_skel.cpp toplevel_skel.h toplevel.kidl \ - applet_skel.cpp applet_skel.h applet.kidl + applet_skel.cpp applet_skel.h applet.kidl \ + toplevel_skel.cpp toplevel_skel.h toplevel.kidl #>+ 2 docs-am: @@ -893,18 +905,6 @@ force-reedit: #>+ 11 -klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp toplevel_skel.cpp urlgrabber.moc configdialog.moc toplevel.moc - @echo 'creating klipper_la.all_cpp.cpp ...'; \ - rm -f klipper_la.all_cpp.files klipper_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> klipper_la.all_cpp.final; \ - for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp ; do \ - echo "#include \"$$file\"" >> klipper_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper_la.all_cpp.final; \ - done; \ - cat klipper_la.all_cpp.final klipper_la.all_cpp.files > klipper_la.all_cpp.cpp; \ - rm -f klipper_la.all_cpp.final klipper_la.all_cpp.files - -#>+ 11 klipper_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/applet.cpp applet_skel.cpp applet.moc @echo 'creating klipper_panelapplet_la.all_cpp.cpp ...'; \ rm -f klipper_panelapplet_la.all_cpp.files klipper_panelapplet_la.all_cpp.final; \ @@ -916,22 +916,34 @@ klipper_panelapplet_la.all_cpp.cpp: $(sr cat klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files > klipper_panelapplet_la.all_cpp.cpp; \ rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files +#>+ 11 +libklipper_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp toplevel_skel.cpp urlgrabber.moc toplevel.moc configdialog.moc + @echo 'creating libklipper_main_la.all_cpp.cpp ...'; \ + rm -f libklipper_main_la.all_cpp.files libklipper_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libklipper_main_la.all_cpp.final; \ + for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp ; do \ + echo "#include \"$$file\"" >> libklipper_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklipper_main_la.all_cpp.final; \ + done; \ + cat libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files > libklipper_main_la.all_cpp.cpp; \ + rm -f libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files + #>+ 3 clean-final: - -rm -f klipper_la.all_cpp.cpp klipper_panelapplet_la.all_cpp.cpp + -rm -f klipper_panelapplet_la.all_cpp.cpp libklipper_main_la.all_cpp.cpp #>+ 2 final: - $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" all-am + $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" install-am + $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" all-am + $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" install-am + $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean @@ -941,11 +953,11 @@ kde-rpo-clean: -rm -f *.rpo #>+ 9 -toplevel.lo: toplevel.moc +urlgrabber.o: urlgrabber.moc +toplevel.o: toplevel.moc urlgrabber.lo: urlgrabber.moc -configdialog.lo: configdialog.moc +toplevel.lo: toplevel.moc applet.lo: applet.moc applet.o: applet.moc +configdialog.lo: configdialog.moc configdialog.o: configdialog.moc -urlgrabber.o: urlgrabber.moc -toplevel.o: toplevel.moc