$NetBSD: patch-cj,v 1.7 2004/01/15 10:15:14 markd Exp $

--- konqueror/client/Makefile.in.orig	2004-01-02 14:06:01.000000000 +1300
+++ konqueror/client/Makefile.in
@@ -425,14 +425,18 @@ x_libraries = @x_libraries@
 AM_CPPFLAGS = -DQT_NO_CAST_ASCII
 
 bin_PROGRAMS = kfmclient
-lib_LTLIBRARIES = kfmclient.la
+lib_LTLIBRARIES = libkfmclient_main.la kfmclient.la
 
 INCLUDES = -I.. $(all_includes)
-kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kfmclient_la_LIBADD = $(LIB_KIO)
-#>- kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
+libkfmclient_main_la_LDFLAGS = $(all_libraries)
+libkfmclient_main_la_LIBADD = $(LIB_KIO)
+#>- libkfmclient_main_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
 #>+ 1
-kfmclient_la_SOURCES=kfmclient.cc   KonquerorIface_stub.cc KDesktopIface_stub.cc
+libkfmclient_main_la_SOURCES=kfmclient.cc   KonquerorIface_stub.cc KDesktopIface_stub.cc
+
+kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
+kfmclient_la_LIBADD = libkfmclient_main.la
+kfmclient_la_SOURCES = kfmclient_main.cc
 
 noinst_HEADERS = kfmclient.h
 #>- METASOURCES = AUTO
@@ -440,9 +444,9 @@ noinst_HEADERS = kfmclient.h
 KonquerorIface_DIR = $(srcdir)/..
 KDesktopIface_DIR = $(top_srcdir)/kdesktop
 
-kfmclient_SOURCES = dummy.cc
+kfmclient_SOURCES = kfmclient_main.cc
 kfmclient_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-kfmclient_LDADD = kfmclient.la
+kfmclient_LDADD = libkfmclient_main.la
 subdir = konqueror/client
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
@@ -450,30 +454,41 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
-kfmclient_la_DEPENDENCIES =
-am_kfmclient_la_OBJECTS = kfmclient.lo
+kfmclient_la_DEPENDENCIES = libkfmclient_main.la
+am_kfmclient_la_OBJECTS = kfmclient_main.lo
 #>- kfmclient_la_OBJECTS = $(am_kfmclient_la_OBJECTS)
+#>+ 1
+kfmclient_la_OBJECTS = kfmclient_main.lo
+libkfmclient_main_la_DEPENDENCIES =
+am_libkfmclient_main_la_OBJECTS = kfmclient.lo
+#>- libkfmclient_main_la_OBJECTS = $(am_libkfmclient_main_la_OBJECTS)
 #>+ 4
-kfmclient_la_final_OBJECTS = kfmclient_la.all_cc.lo 
-kfmclient_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo
-@KDE_USE_FINAL_FALSE@kfmclient_la_OBJECTS = $(kfmclient_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kfmclient_la_OBJECTS = $(kfmclient_la_final_OBJECTS)
+libkfmclient_main_la_final_OBJECTS = libkfmclient_main_la.all_cc.lo 
+libkfmclient_main_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo
+@KDE_USE_FINAL_FALSE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_final_OBJECTS)
 bin_PROGRAMS = kfmclient$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-am_kfmclient_OBJECTS = dummy.$(OBJEXT)
+am_kfmclient_OBJECTS = kfmclient_main.$(OBJEXT)
 #>- kfmclient_OBJECTS = $(am_kfmclient_OBJECTS)
 #>+ 1
-kfmclient_OBJECTS = dummy.$(OBJEXT)
-kfmclient_DEPENDENCIES = kfmclient.la
+kfmclient_OBJECTS = kfmclient_main.$(OBJEXT)
+kfmclient_DEPENDENCIES = libkfmclient_main.la
 
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kfmclient.Plo
-#>+ 3
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P  $(DEPDIR)/kfmclient_la.all_cc.P  ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kfmclient.Plo
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P  ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kfmclient.Plo
+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kfmclient.Plo \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/kfmclient_main.Plo \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/kfmclient_main.Po
+#>+ 7
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P  $(DEPDIR)/libkfmclient_main_la.all_cc.P  ./$(DEPDIR)/kfmclient.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kfmclient_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kfmclient_main.Po
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P  ./$(DEPDIR)/kfmclient.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kfmclient_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kfmclient_main.Po
 
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -493,11 +508,12 @@ CXXLD = $(CXX)
 #>+ 2
 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(kfmclient_la_SOURCES) $(kfmclient_SOURCES)
+DIST_SOURCES = $(kfmclient_la_SOURCES) $(libkfmclient_main_la_SOURCES) \
+	$(kfmclient_SOURCES)
 HEADERS = $(noinst_HEADERS)
 
 DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in
-SOURCES = $(kfmclient_la_SOURCES) $(kfmclient_SOURCES)
+SOURCES = $(kfmclient_la_SOURCES) $(libkfmclient_main_la_SOURCES) $(kfmclient_SOURCES)
 
 #>- all: all-am
 #>+ 1
@@ -544,6 +560,8 @@ clean-libLTLIBRARIES:
 	done
 kfmclient.la: $(kfmclient_la_OBJECTS) $(kfmclient_la_DEPENDENCIES) 
 	$(CXXLINK) -rpath $(libdir) $(kfmclient_la_LDFLAGS) $(kfmclient_la_OBJECTS) $(kfmclient_la_LIBADD) $(LIBS)
+libkfmclient_main.la: $(libkfmclient_main_la_OBJECTS) $(libkfmclient_main_la_DEPENDENCIES) 
+	$(CXXLINK) -rpath $(libdir) $(libkfmclient_main_la_LDFLAGS) $(libkfmclient_main_la_OBJECTS) $(libkfmclient_main_la_LIBADD) $(LIBS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -583,8 +601,9 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kfmclient.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kfmclient_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kfmclient_main.Po@am__quote@
 
 distclean-depend:
 	-rm -rf ./$(DEPDIR)
@@ -685,7 +704,12 @@ GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 4
+KDE_DIST=Makefile.in.rej 
+
+DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
@@ -817,15 +841,18 @@ uninstall-am: uninstall-binPROGRAMS unin
 	uninstall-libLTLIBRARIES
 
 
-dummy.cc:
-	echo > dummy.cc
-
 messages:
 	$(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot
 # 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:
 
+#>+ 3
+kfmclient.moc: $(srcdir)/kfmclient.h
+	$(MOC) $(srcdir)/kfmclient.h -o kfmclient.moc
+
+#>+ 1
+mocs: kfmclient.moc
 #>+ 9
 KonquerorIface.kidl: $(srcdir)/../KonquerorIface.h $(DCOP_DEPENDENCIES)
 	$(DCOPIDL) $(srcdir)/../KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; false )
@@ -837,12 +864,6 @@ KDesktopIface_stub.h: KDesktopIface.kidl
 	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-skel KDesktopIface.kidl
 
 #>+ 3
-kfmclient.moc: $(srcdir)/kfmclient.h
-	$(MOC) $(srcdir)/kfmclient.h -o kfmclient.moc
-
-#>+ 1
-mocs: kfmclient.moc
-#>+ 3
 clean-metasources:
 	-rm -f  kfmclient.moc
 
@@ -863,33 +884,33 @@ force-reedit:
 
 
 #>+ 11
-kfmclient_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc  kfmclient.moc
-	@echo 'creating kfmclient_la.all_cc.cc ...'; \
-	rm -f kfmclient_la.all_cc.files kfmclient_la.all_cc.final; \
-	echo "#define KDE_USE_FINAL 1" >> kfmclient_la.all_cc.final; \
+libkfmclient_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc  kfmclient.moc
+	@echo 'creating libkfmclient_main_la.all_cc.cc ...'; \
+	rm -f libkfmclient_main_la.all_cc.files libkfmclient_main_la.all_cc.final; \
+	echo "#define KDE_USE_FINAL 1" >> libkfmclient_main_la.all_cc.final; \
 	for file in kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc ; do \
-	  echo "#include \"$$file\"" >> kfmclient_la.all_cc.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kfmclient_la.all_cc.final; \
+	  echo "#include \"$$file\"" >> libkfmclient_main_la.all_cc.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkfmclient_main_la.all_cc.final; \
 	done; \
-	cat kfmclient_la.all_cc.final kfmclient_la.all_cc.files > kfmclient_la.all_cc.cc; \
-	rm -f kfmclient_la.all_cc.final kfmclient_la.all_cc.files
+	cat libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files > libkfmclient_main_la.all_cc.cc; \
+	rm -f libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files
 
 #>+ 3
 clean-final:
-	-rm -f kfmclient_la.all_cc.cc
+	-rm -f libkfmclient_main_la.all_cc.cc
 
 #>+ 2
 final:
-	$(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_final_OBJECTS)" all-am
+	$(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_final_OBJECTS)" all-am
 #>+ 2
 final-install:
-	$(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_final_OBJECTS)" install-am
+	$(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_final_OBJECTS)" install-am
 #>+ 2
 no-final:
-	$(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_nofinal_OBJECTS)" all-am
+	$(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_nofinal_OBJECTS)" all-am
 #>+ 2
 no-final-install:
-	$(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_nofinal_OBJECTS)" install-am
+	$(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_nofinal_OBJECTS)" install-am
 #>+ 3
 cvs-clean:
 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -899,8 +920,8 @@ kde-rpo-clean:
 	-rm -f *.rpo
 
 #>+ 6
-kfmclient.lo: kfmclient.moc 
+$(srcdir)/kfmclient.cc: KonquerorIface_stub.h KDesktopIface_stub.h 
 KDesktopIface_stub.cc: KDesktopIface_stub.h 
-kfmclient.o: kfmclient.moc 
 KonquerorIface_stub.cc: KonquerorIface_stub.h 
-$(srcdir)/kfmclient.cc: KonquerorIface_stub.h KDesktopIface_stub.h 
+kfmclient.lo: kfmclient.moc 
+kfmclient.o: kfmclient.moc