diff options
Diffstat (limited to 'x11/kdelibs3/patches/patch-ak')
| -rw-r--r-- | x11/kdelibs3/patches/patch-ak | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/x11/kdelibs3/patches/patch-ak b/x11/kdelibs3/patches/patch-ak index bf3beec2331..0e09ce82bf1 100644 --- a/x11/kdelibs3/patches/patch-ak +++ b/x11/kdelibs3/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.3 2003/01/02 09:12:39 skrll Exp $ +$NetBSD: patch-ak,v 1.4 2003/03/11 13:10:35 markd Exp $ ---- kconf_update/Makefile.in.orig Tue Nov 26 08:57:39 2002 +--- kconf_update/Makefile.in.orig Thu Jan 23 12:30:34 2003 +++ kconf_update/Makefile.in -@@ -282,16 +282,20 @@ x_libraries = @x_libraries@ +@@ -302,16 +302,20 @@ INCLUDES = $(all_includes) @@ -28,7 +28,7 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:39 skrll Exp $ #>- METASOURCES = AUTO subdir = kconf_update -@@ -300,19 +304,24 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -320,19 +324,24 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -59,24 +59,26 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:39 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -320,9 +329,13 @@ CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ +@@ -341,11 +350,13 @@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kconf_update.Plo --#>+ 2 --@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 + am__depfiles_maybe = depfiles +-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconf_update.Plo +-#>+ 3 +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(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 +#>+ 4 -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kconf_update.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kconf_update_main.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kconf_update_main.Po ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kconf_update.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconf_update_main.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconf_update_main.Po #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -343,9 +356,10 @@ CXXLD = $(CXX) +@@ -366,9 +377,10 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -89,27 +91,27 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:39 skrll Exp $ #>- all: all-am #>+ 1 -@@ -394,6 +408,8 @@ clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +@@ -415,6 +427,8 @@ + done 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) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -428,8 +444,9 @@ mostlyclean-compile: +@@ -454,8 +468,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@ +-@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 +619,6 @@ uninstall-am: uninstall-binPROGRAMS unin + -rm -rf ./$(DEPDIR) +@@ -646,9 +661,6 @@ # Internal # noinst_HEADERS = kconf_update.h |