diff options
Diffstat (limited to 'x11/libX11/patches/patch-ae')
| -rw-r--r-- | x11/libX11/patches/patch-ae | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/x11/libX11/patches/patch-ae b/x11/libX11/patches/patch-ae index bdf3126eafa..4e8f387066b 100644 --- a/x11/libX11/patches/patch-ae +++ b/x11/libX11/patches/patch-ae @@ -1,16 +1,18 @@ -$NetBSD: patch-ae,v 1.3 2008/04/17 12:33:56 wiz Exp $ +$NetBSD: patch-ae,v 1.4 2009/02/21 16:44:29 wiz Exp $ ---- src/util/Makefile.in.orig 2008-03-06 20:48:52.000000000 +0000 +--- src/util/Makefile.in.orig 2009-02-17 15:11:02.000000000 +0000 +++ src/util/Makefile.in -@@ -34,7 +34,6 @@ PRE_UNINSTALL = : +@@ -34,7 +34,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -noinst_PROGRAMS = makekeys$(EXEEXT) ++noinst_PROGRAMS = makekeys$(EXEEXT) $(MAKEKEYS_PROG) ++@CROSS_COMPILING_TRUE@MAKEKEYS_PROG = xmakekeys$(EXEEXT) subdir = src/util DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -53,6 +52,9 @@ makekeys_LDADD = $(LDADD) +@@ -53,6 +54,9 @@ makekeys_LDADD = $(LDADD) makekeys_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -20,10 +22,10 @@ $NetBSD: patch-ae,v 1.3 2008/04/17 12:33:56 wiz Exp $ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@@ -62,8 +64,11 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) +@@ -62,8 +66,11 @@ CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ -SOURCES = makekeys.c -DIST_SOURCES = makekeys.c +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -34,20 +36,7 @@ $NetBSD: patch-ae,v 1.3 2008/04/17 12:33:56 wiz Exp $ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -225,10 +230,9 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -+noinst_PROGRAMS = makekeys$(EXEEXT) $(MAKEKEYS_PROG) - makekeys_CFLAGS = $(X11_CFLAGS) -- --#override CC = gcc --LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+@CROSS_COMPILING_TRUE@MAKEKEYS_PROG = xmakekeys$(EXEEXT) - EXTRA_DIST = mkks.sh - - # Check source code with tools like lint & sparse -@@ -278,6 +282,9 @@ clean-noinstPROGRAMS: +@@ -282,6 +289,9 @@ clean-noinstPROGRAMS: makekeys$(EXEEXT): $(makekeys_OBJECTS) $(makekeys_DEPENDENCIES) @rm -f makekeys$(EXEEXT) $(makekeys_LINK) $(makekeys_OBJECTS) $(makekeys_LDADD) $(LIBS) @@ -57,7 +46,7 @@ $NetBSD: patch-ae,v 1.3 2008/04/17 12:33:56 wiz Exp $ mostlyclean-compile: -rm -f *.$(OBJEXT) -@@ -286,6 +293,7 @@ distclean-compile: +@@ -290,6 +300,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makekeys-makekeys.Po@am__quote@ @@ -65,7 +54,7 @@ $NetBSD: patch-ae,v 1.3 2008/04/17 12:33:56 wiz Exp $ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -504,6 +512,10 @@ uninstall-am: +@@ -508,6 +519,10 @@ uninstall-am: pdf pdf-am ps ps-am tags uninstall uninstall-am |