$NetBSD: patch-al,v 1.3 2001/12/03 15:37:21 skrll Exp $ --- kconf_update/Makefile.in.orig Tue Nov 13 20:57:04 2001 +++ kconf_update/Makefile.in @@ -277,16 +277,20 @@ INCLUDES = $(all_includes) -lib_LTLIBRARIES = kconf_update.la +lib_LTLIBRARIES = libkconf_update_main.la kconf_update.la bin_PROGRAMS = kconf_update -kconf_update_SOURCES = dummy.cpp -kconf_update_LDADD = kconf_update.la +kconf_update_SOURCES = kconf_update_main.cpp +kconf_update_LDADD = libkconf_update_main.la kconf_update_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kconf_update_la_SOURCES = kconf_update.cpp -kconf_update_la_LIBADD = ../kdecore/libkdecore.la +libkconf_update_main_la_SOURCES = kconf_update.cpp +libkconf_update_main_la_LIBADD = ../kdecore/libkdecore.la +libkconf_update_main_la_LDFLAGS = $(all_libraries) + +kconf_update_la_SOURCES = kconf_update_main.cpp kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version +kconf_update_la_LIBADD = libkconf_update_main.la #>- METASOURCES = AUTO mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs @@ -299,17 +303,21 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -kconf_update_la_DEPENDENCIES = ../kdecore/libkdecore.la -#>- kconf_update_la_OBJECTS = kconf_update.lo +libkconf_update_main_la_DEPENDENCIES = ../kdecore/libkdecore.la +#>- libkconf_update_main_la_OBJECTS = kconf_update.lo +#>+ 1 +libkconf_update_main_la_OBJECTS = kconf_update.lo +kconf_update_la_DEPENDENCIES = libkconf_update_main.la +#>- kconf_update_la_OBJECTS = kconf_update_main.lo #>+ 1 -kconf_update_la_OBJECTS = kconf_update.lo +kconf_update_la_OBJECTS = kconf_update_main.lo bin_PROGRAMS = kconf_update$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -#>- kconf_update_OBJECTS = dummy.$(OBJEXT) +#>- kconf_update_OBJECTS = kconf_update_main.$(OBJEXT) #>+ 1 -kconf_update_OBJECTS = dummy.$(OBJEXT) -kconf_update_DEPENDENCIES = kconf_update.la +kconf_update_OBJECTS = kconf_update_main.$(OBJEXT) +kconf_update_DEPENDENCIES = libkconf_update_main.la CXXFLAGS = @CXXFLAGS@ #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) #>+ 1 @@ -333,8 +341,8 @@ TAR = tar GZIP_ENV = --best -SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) -OBJECTS = $(kconf_update_la_OBJECTS) $(kconf_update_OBJECTS) +SOURCES = $(libkconf_update_main_la_SOURCES) $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) +OBJECTS = $(libkconf_update_main_la_OBJECTS) $(kconf_update_la_OBJECTS) $(kconf_update_OBJECTS) #>- all: all-redirect #>+ 1 @@ -421,6 +429,9 @@ maintainer-clean-libtool: +libkconf_update_main.la: $(libkconf_update_main_la_OBJECTS) $(libkconf_update_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkconf_update_main_la_LDFLAGS) $(libkconf_update_main_la_OBJECTS) $(libkconf_update_main_la_LIBADD) $(LIBS) + kconf_update.la: $(kconf_update_la_OBJECTS) $(kconf_update_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kconf_update_la_LDFLAGS) $(kconf_update_la_OBJECTS) $(kconf_update_la_LIBADD) $(LIBS) @@ -592,9 +603,6 @@ # Internal # noinst_HEADERS = kconf_update.h -dummy.cpp: - echo > dummy.cpp - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -609,11 +617,23 @@ #>+ 11 -kconf_update_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update.cpp +libkconf_update_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update.cpp + @echo 'creating libkconf_update_main_la.all_cpp.cpp ...'; \ + rm -f libkconf_update_main_la.all_cpp.files libkconf_update_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkconf_update_main_la.all_cpp.final; \ + for file in kconf_update.cpp ; do \ + echo "#include \"$$file\"" >> libkconf_update_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkconf_update_main_la.all_cpp.final; \ + done; \ + cat libkconf_update_main_la.all_cpp.final libkconf_update_main_la.all_cpp.files > libkconf_update_main_la.all_cpp.cpp; \ + rm -f libkconf_update_main_la.all_cpp.final libkconf_update_main_la.all_cpp.files + +#>+ 11 +kconf_update_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update_main.cpp @echo 'creating kconf_update_la.all_cpp.cpp ...'; \ rm -f kconf_update_la.all_cpp.files kconf_update_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kconf_update_la.all_cpp.final; \ - for file in kconf_update.cpp ; do \ + for file in kconf_update_main.cpp ; do \ echo "#include \"$$file\"" >> kconf_update_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kconf_update_la.all_cpp.final; \ done; \ @@ -621,11 +641,11 @@ rm -f kconf_update_la.all_cpp.final kconf_update_la.all_cpp.files #>+ 11 -kconf_update.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kconf_update.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update_main.cpp @echo 'creating kconf_update.all_cpp.cpp ...'; \ rm -f kconf_update.all_cpp.files kconf_update.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kconf_update.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kconf_update_main.cpp ; do \ echo "#include \"$$file\"" >> kconf_update.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kconf_update.all_cpp.final; \ done; \ @@ -634,7 +654,7 @@ #>+ 3 clean-final: - -rm -f kconf_update_la.all_cpp.cpp kconf_update.all_cpp.cpp + -rm -f libkconf_update_main_la.all_cpp.cpp kconf_update_la.all_cpp.cpp kconf_update.all_cpp.cpp #>+ 2 final: