$NetBSD: patch-bn,v 1.4 2003/01/02 09:12:39 skrll Exp $ --- kioslave/http/Makefile.in.orig Tue Nov 26 08:57:39 2002 +++ kioslave/http/Makefile.in @@ -273,19 +273,22 @@ LDFLAGS = $(all_libraries) ####### Files bin_PROGRAMS = kio_http_cache_cleaner -lib_LTLIBRARIES = kio_http_cache_cleaner.la +lib_LTLIBRARIES = libkio_http_cache_cleaner_main.la kio_http_cache_cleaner.la kde_module_LTLIBRARIES = kio_http.la kio_http_la_SOURCES = http.cc kio_http_la_LIBADD = $(LIB_KIO) $(LIBZ) kio_http_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kio_http_cache_cleaner_SOURCES = dummy.cpp -kio_http_cache_cleaner_LDADD = kio_http_cache_cleaner.la +kio_http_cache_cleaner_SOURCES = http_cache_cleaner_main.cpp +kio_http_cache_cleaner_LDADD = libkio_http_cache_cleaner_main.la kio_http_cache_cleaner_LDFLAGS = $(KDE_RPATH) -kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp -kio_http_cache_cleaner_la_LIBADD = $(LIB_KIO) +libkio_http_cache_cleaner_main_la_SOURCES = http_cache_cleaner.cpp +libkio_http_cache_cleaner_main_la_LIBADD = $(LIB_KIO) + +kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner_main.cpp +kio_http_cache_cleaner_la_LIBADD = libkio_http_cache_cleaner_main.la kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version noinst_HEADERS = http.h @@ -305,31 +308,43 @@ am_kio_http_la_OBJECTS = http.lo #>- kio_http_la_OBJECTS = $(am_kio_http_la_OBJECTS) #>+ 1 kio_http_la_OBJECTS = http.lo -kio_http_cache_cleaner_la_DEPENDENCIES = -am_kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner.lo +kio_http_cache_cleaner_la_DEPENDENCIES = \ + libkio_http_cache_cleaner_main.la +am_kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner_main.lo #>- kio_http_cache_cleaner_la_OBJECTS = \ #>- $(am_kio_http_cache_cleaner_la_OBJECTS) #>+ 1 -kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner.lo +kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner_main.lo +libkio_http_cache_cleaner_main_la_LDFLAGS = +libkio_http_cache_cleaner_main_la_DEPENDENCIES = +am_libkio_http_cache_cleaner_main_la_OBJECTS = http_cache_cleaner.lo +#>- libkio_http_cache_cleaner_main_la_OBJECTS = \ +#>- $(am_libkio_http_cache_cleaner_main_la_OBJECTS) +#>+ 1 +libkio_http_cache_cleaner_main_la_OBJECTS = http_cache_cleaner.lo bin_PROGRAMS = kio_http_cache_cleaner$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kio_http_cache_cleaner_OBJECTS = dummy.$(OBJEXT) +am_kio_http_cache_cleaner_OBJECTS = http_cache_cleaner_main.$(OBJEXT) #>- kio_http_cache_cleaner_OBJECTS = $(am_kio_http_cache_cleaner_OBJECTS) #>+ 1 -kio_http_cache_cleaner_OBJECTS = dummy.$(OBJEXT) -kio_http_cache_cleaner_DEPENDENCIES = kio_http_cache_cleaner.la +kio_http_cache_cleaner_OBJECTS = http_cache_cleaner_main.$(OBJEXT) +kio_http_cache_cleaner_DEPENDENCIES = libkio_http_cache_cleaner_main.la DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/http.Plo \ -#>- @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner.Plo -#>+ 3 -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/http.Plo \ -@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner.Plo +#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/http.Plo \ +#>- @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner.Plo \ +#>- @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner_main.Plo \ +#>- @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner_main.Po +#>+ 5 +@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/http.Plo \ +@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner.Plo \ +@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner_main.Plo \ +@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner_main.Po #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -360,6 +375,7 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $( $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(kio_http_la_SOURCES) \ $(kio_http_cache_cleaner_la_SOURCES) \ + $(libkio_http_cache_cleaner_main_la_SOURCES) \ $(kio_http_cache_cleaner_SOURCES) DATA = $(kdelnk_DATA) @@ -372,7 +388,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES) $(kio_http_cache_cleaner_SOURCES) +SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES) $(libkio_http_cache_cleaner_main_la_SOURCES) $(kio_http_cache_cleaner_SOURCES) #>- all: all-recursive #>+ 1 @@ -445,6 +461,8 @@ clean-libLTLIBRARIES: $(CXXLINK) -rpath $(kde_moduledir) $(kio_http_la_LDFLAGS) $(kio_http_la_OBJECTS) $(kio_http_la_LIBADD) $(LIBS) kio_http_cache_cleaner.la: $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kio_http_cache_cleaner_la_LDFLAGS) $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_LIBADD) $(LIBS) +libkio_http_cache_cleaner_main.la: $(libkio_http_cache_cleaner_main_la_OBJECTS) $(libkio_http_cache_cleaner_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkio_http_cache_cleaner_main_la_LDFLAGS) $(libkio_http_cache_cleaner_main_la_OBJECTS) $(libkio_http_cache_cleaner_main_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@ -479,9 +497,10 @@ 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)/http.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/http_cache_cleaner.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/http_cache_cleaner_main.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/http_cache_cleaner_main.Po@am__quote@ distclean-depend: -rm -rf $(DEPDIR) @@ -635,7 +654,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=webdav.protocol http_cache_cleaner.desktop README.webdav THOUGHTS README.http_cache_cleaner webdavs.protocol rfc2617.txt rfc2616.txt http.protocol https.protocol +KDE_DIST=README.http_cache_cleaner http_cache_cleaner.desktop webdavs.protocol rfc2617.txt http.protocol webdav.protocol README.webdav https.protocol THOUGHTS rfc2616.txt DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@ -778,9 +797,6 @@ uninstall-info: uninstall-info-recursive uninstall-kdelnkDATA uninstall-libLTLIBRARIES \ uninstall-recursive - -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: