$NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam Exp $

--- kconf_update/Makefile.in.orig	Tue May 21 15:42:05 2002
+++ kconf_update/Makefile.in
@@ -282,16 +282,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
 subdir = kconf_update
@@ -300,19 +304,24 @@
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
-kconf_update_la_DEPENDENCIES = ../kdecore/libkdecore.la
-am_kconf_update_la_OBJECTS = kconf_update.lo
+kconf_update_la_DEPENDENCIES = libkconf_update_main.la
+am_kconf_update_la_OBJECTS = kconf_update_main.lo
 #>- kconf_update_la_OBJECTS = $(am_kconf_update_la_OBJECTS)
 #>+ 1
-kconf_update_la_OBJECTS = kconf_update.lo
+kconf_update_la_OBJECTS = kconf_update_main.lo
+libkconf_update_main_la_DEPENDENCIES = ../kdecore/libkdecore.la
+am_libkconf_update_main_la_OBJECTS = kconf_update.lo
+#>- libkconf_update_main_la_OBJECTS = $(am_libkconf_update_main_la_OBJECTS)
+#>+ 1
+libkconf_update_main_la_OBJECTS = kconf_update.lo
 bin_PROGRAMS = kconf_update$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-am_kconf_update_OBJECTS = dummy.$(OBJEXT)
+am_kconf_update_OBJECTS = kconf_update_main.$(OBJEXT)
 #>- kconf_update_OBJECTS = $(am_kconf_update_OBJECTS)
 #>+ 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
 
 DEFS = @DEFS@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
@@ -320,7 +329,9 @@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kconf_update.Plo
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kconf_update.Plo \
+	@AMDEP_TRUE@	$(DEPDIR)/kconf_update_main.Plo \
+	@AMDEP_TRUE@	$(DEPDIR)/kconf_update_main.Po
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
@@ -340,9 +351,10 @@
 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES)
+DIST_SOURCES = $(kconf_update_la_SOURCES) \
+	$(libkconf_update_main_la_SOURCES) $(kconf_update_SOURCES)
 DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES)
+SOURCES = $(kconf_update_la_SOURCES) $(libkconf_update_main_la_SOURCES) $(kconf_update_SOURCES)
 
 #>- all: all-am
 #>+ 1
@@ -391,6 +403,8 @@
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 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)
+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)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -425,8 +439,9 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kconf_update.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kconf_update_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kconf_update_main.Po@am__quote@
 
 distclean-depend:
 	-rm -rf $(DEPDIR)
@@ -602,9 +617,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:
@@ -620,11 +632,11 @@
 
 
 #>+ 11
-kconf_update_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update.cpp  
+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; \
@@ -632,11 +644,23 @@
 	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  
+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.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; \
@@ -645,7 +669,7 @@
 
 #>+ 3
 clean-final:
-	-rm -f kconf_update_la.all_cpp.cpp kconf_update.all_cpp.cpp
+	-rm -f kconf_update_la.all_cpp.cpp libkconf_update_main_la.all_cpp.cpp kconf_update.all_cpp.cpp
 
 #>+ 2
 final: