Hello Joerg,
smaller patches are nicer than larger ones. By the way, each patch should start with a line containing an RCS Id.
This commit is contained in:
parent
769c2f51fd
commit
7e4a4f7195
6 changed files with 108 additions and 3155 deletions
|
@ -1,11 +1,11 @@
|
|||
$NetBSD: distinfo,v 1.4 2007/08/01 16:52:48 joerg Exp $
|
||||
$NetBSD: distinfo,v 1.5 2007/09/20 08:30:14 rillig Exp $
|
||||
|
||||
SHA1 (libXt-1.0.5.tar.bz2) = 5f33921e373ce162a39eabef2ce05d946935eb5b
|
||||
RMD160 (libXt-1.0.5.tar.bz2) = 7e5ef9e03dc860bf5b64b85a897dd1d2ae1ed0bf
|
||||
Size (libXt-1.0.5.tar.bz2) = 500502 bytes
|
||||
SHA1 (patch-aa) = bc1b32ac62f012cea92de65f73ecaf521ede16e5
|
||||
SHA1 (patch-ab) = 63c879f286463b6bf4a8abe21665ec3ec68c07f9
|
||||
SHA1 (patch-ac) = 44eaf65a5e073751d1400d1fd32cb0f668780c10
|
||||
SHA1 (patch-ad) = a183a0bab063f3ea6408de13942ffa2923e9fff4
|
||||
SHA1 (patch-ae) = 50df4f273605bf1a81deaf29ecbc041e319df0c1
|
||||
SHA1 (patch-af) = 01efc8d0da4777dc828d3876b297301e70cfaf1d
|
||||
SHA1 (patch-ab) = 9a03be1b08aa72375c80a21dfe10bd79fbd37a83
|
||||
SHA1 (patch-ac) = d053f56de09d13fc60b5a8dd281837020a0aee95
|
||||
SHA1 (patch-ad) = 5fa9b62316dc04eaf80cec20fc900cdd120751af
|
||||
SHA1 (patch-ae) = feff93927edcb31c1c9320212df0754b4cab0676
|
||||
SHA1 (patch-af) = 8cc0692ff61345149830682703533e65870d1693
|
||||
|
|
|
@ -1,149 +1,54 @@
|
|||
$NetBSD: patch-ab,v 1.3 2007/08/01 16:52:48 joerg Exp $
|
||||
$NetBSD: patch-ab,v 1.4 2007/09/20 08:30:14 rillig Exp $
|
||||
|
||||
--- util/Makefile.in.orig 2007-01-28 07:31:13.000000000 +0100
|
||||
+++ util/Makefile.in
|
||||
@@ -1,8 +1,8 @@
|
||||
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
|
||||
+# Makefile.in generated by automake 1.10 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
-# 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
@@ -15,15 +15,11 @@
|
||||
@SET_MAKE@
|
||||
|
||||
|
||||
-srcdir = @srcdir@
|
||||
-top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
-top_builddir = ..
|
||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||
-INSTALL = @INSTALL@
|
||||
install_sh_DATA = $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = $(install_sh) -c
|
||||
install_sh_SCRIPT = $(install_sh) -c
|
||||
@@ -38,7 +34,9 @@ POST_UNINSTALL = :
|
||||
+++ util/Makefile.in 2007-09-20 10:23:58.000000000 +0200
|
||||
@@ -38,7 +38,9 @@ POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
@INSTALL_MAKESTRS_TRUE@bin_PROGRAMS = makestrs$(EXEEXT)
|
||||
-@INSTALL_MAKESTRS_FALSE@noinst_PROGRAMS = makestrs$(EXEEXT)
|
||||
+@INSTALL_MAKESTRS_FALSE@noinst_PROGRAMS = makestrs$(EXEEXT) \
|
||||
+@INSTALL_MAKESTRS_FALSE@ $(MAKESTRS_PROG)
|
||||
+@INSTALL_MAKESTRS_TRUE@noinst_PROGRAMS = $(MAKESTRS_PROG)
|
||||
+@INSTALL_MAKESTRS_FALSE@ $(am__EXEEXT_1)
|
||||
+@INSTALL_MAKESTRS_TRUE@noinst_PROGRAMS = $(am__EXEEXT_1)
|
||||
subdir = util
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
@@ -55,19 +53,26 @@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROG
|
||||
@@ -51,10 +53,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
|
||||
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
||||
+@CROSS_COMPILING_TRUE@am__EXEEXT_1 = xmakestrs$(EXEEXT)
|
||||
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
|
||||
am_makestrs_OBJECTS = makestrs-makestrs.$(OBJEXT)
|
||||
makestrs_OBJECTS = $(am_makestrs_OBJECTS)
|
||||
makestrs_LDADD = $(LDADD)
|
||||
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
||||
+makestrs_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
||||
+ --mode=link $(CCLD) $(makestrs_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
|
||||
+ $(LDFLAGS) -o $@
|
||||
+xmakestrs_SOURCES = xmakestrs.c
|
||||
+xmakestrs_OBJECTS = xmakestrs.$(OBJEXT)
|
||||
+xmakestrs_LDADD = $(LDADD)
|
||||
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
|
||||
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
|
||||
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
|
||||
- $(AM_CFLAGS) $(CFLAGS)
|
||||
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
||||
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
@@ -66,8 +72,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
|
||||
CCLD = $(CC)
|
||||
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
-SOURCES = $(makestrs_SOURCES)
|
||||
-DIST_SOURCES = $(makestrs_SOURCES)
|
||||
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
||||
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
|
||||
+ $(LDFLAGS) -o $@
|
||||
+SOURCES = $(makestrs_SOURCES) xmakestrs.c
|
||||
+DIST_SOURCES = $(makestrs_SOURCES) xmakestrs.c
|
||||
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
||||
am__vpath_adj = case $$p in \
|
||||
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
||||
@@ -82,8 +87,6 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
-AMDEP_FALSE = @AMDEP_FALSE@
|
||||
-AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
@@ -117,9 +120,8 @@ FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
+INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
-INSTALL_MAKESTRS_FALSE = @INSTALL_MAKESTRS_FALSE@
|
||||
-INSTALL_MAKESTRS_TRUE = @INSTALL_MAKESTRS_TRUE@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
@@ -132,12 +134,11 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
+MKDIR_P = $(mkdir_p)
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
@@ -160,13 +161,13 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLA
|
||||
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
|
||||
XT_CFLAGS = @XT_CFLAGS@
|
||||
XT_LIBS = @XT_LIBS@
|
||||
+abs_builddir = @abs_builddir@
|
||||
+abs_srcdir = @abs_srcdir@
|
||||
+abs_top_builddir = @abs_top_builddir@
|
||||
+abs_top_srcdir = @abs_top_srcdir@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
am__quote = @am__quote@
|
||||
@@ -179,6 +180,7 @@ build_alias = @build_alias@
|
||||
build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
+builddir = @builddir@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
docdir = @docdir@
|
||||
@@ -206,11 +208,15 @@ program_transform_name = @program_transf
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
+srcdir = @srcdir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
+top_builddir = @top_builddir@
|
||||
+top_srcdir = @top_srcdir@
|
||||
@@ -97,6 +103,8 @@ CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
+CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
|
||||
+CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@@ -211,6 +219,7 @@ target_alias = @target_alias@
|
||||
EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE)
|
||||
makestrs_CFLAGS = $(XT_CFLAGS)
|
||||
makestrs_SOURCES = makestrs.c
|
||||
|
@ -151,199 +56,32 @@ $NetBSD: patch-ab,v 1.3 2007/08/01 16:52:48 joerg Exp $
|
|||
|
||||
# Man page
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
@@ -262,7 +268,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
install-binPROGRAMS: $(bin_PROGRAMS)
|
||||
@$(NORMAL_INSTALL)
|
||||
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
|
||||
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
|
||||
@list='$(bin_PROGRAMS)'; for p in $$list; do \
|
||||
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
|
||||
if test -f $$p \
|
||||
@@ -297,7 +303,10 @@ clean-noinstPROGRAMS:
|
||||
done
|
||||
@@ -298,6 +307,9 @@ clean-noinstPROGRAMS:
|
||||
makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES)
|
||||
@rm -f makestrs$(EXEEXT)
|
||||
- $(LINK) $(makestrs_LDFLAGS) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
|
||||
+ $(makestrs_LINK) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
|
||||
$(LINK) $(makestrs_LDFLAGS) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
|
||||
+@CROSS_COMPILING_FALSE@xmakestrs$(EXEEXT): $(xmakestrs_OBJECTS) $(xmakestrs_DEPENDENCIES)
|
||||
+@CROSS_COMPILING_FALSE@ @rm -f xmakestrs$(EXEEXT)
|
||||
+@CROSS_COMPILING_FALSE@ $(LINK) $(xmakestrs_OBJECTS) $(xmakestrs_LDADD) $(LIBS)
|
||||
+@CROSS_COMPILING_FALSE@ $(LINK) $(xmakestrs_LDFLAGS) $(xmakestrs_OBJECTS) $(xmakestrs_LDADD) $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -306,38 +315,39 @@ distclean-compile:
|
||||
@@ -306,6 +318,7 @@ distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makestrs-makestrs.Po@am__quote@
|
||||
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmakestrs.Po@am__quote@
|
||||
|
||||
.c.o:
|
||||
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
||||
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
||||
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
||||
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
||||
@@ -542,6 +555,10 @@ uninstall-am: uninstall-appmanDATA unins
|
||||
uninstall-appmanDATA uninstall-binPROGRAMS uninstall-info-am
|
||||
|
||||
.c.obj:
|
||||
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
|
||||
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
||||
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
||||
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
||||
|
||||
.c.lo:
|
||||
-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
||||
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
||||
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
||||
|
||||
makestrs-makestrs.o: makestrs.c
|
||||
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c; \
|
||||
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makestrs-makestrs.Tpo" "$(DEPDIR)/makestrs-makestrs.Po"; else rm -f "$(DEPDIR)/makestrs-makestrs.Tpo"; exit 1; fi
|
||||
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
|
||||
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/makestrs-makestrs.Tpo $(DEPDIR)/makestrs-makestrs.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
|
||||
|
||||
makestrs-makestrs.obj: makestrs.c
|
||||
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`; \
|
||||
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makestrs-makestrs.Tpo" "$(DEPDIR)/makestrs-makestrs.Po"; else rm -f "$(DEPDIR)/makestrs-makestrs.Tpo"; exit 1; fi
|
||||
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
|
||||
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/makestrs-makestrs.Tpo $(DEPDIR)/makestrs-makestrs.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
|
||||
@@ -347,13 +357,9 @@ mostlyclean-libtool:
|
||||
|
||||
clean-libtool:
|
||||
-rm -rf .libs _libs
|
||||
-
|
||||
-distclean-libtool:
|
||||
- -rm -f libtool
|
||||
-uninstall-info-am:
|
||||
install-appmanDATA: $(appman_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
- test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
|
||||
+ test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)"
|
||||
@list='$(appman_DATA)'; for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
f=$(am__strip_dir) \
|
||||
@@ -418,22 +424,21 @@ distclean-tags:
|
||||
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
||||
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
||||
- list='$(DISTFILES)'; for file in $$list; do \
|
||||
- case $$file in \
|
||||
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
|
||||
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
|
||||
- esac; \
|
||||
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
+ list='$(DISTFILES)'; \
|
||||
+ dist_files=`for file in $$list; do echo $$file; done | \
|
||||
+ sed -e "s|^$$srcdirstrip/||;t" \
|
||||
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
|
||||
+ case $$dist_files in \
|
||||
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
|
||||
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
|
||||
+ sort -u` ;; \
|
||||
+ esac; \
|
||||
+ for file in $$dist_files; do \
|
||||
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
||||
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
|
||||
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
|
||||
- dir="/$$dir"; \
|
||||
- $(mkdir_p) "$(distdir)$$dir"; \
|
||||
- else \
|
||||
- dir=''; \
|
||||
- fi; \
|
||||
if test -d $$d/$$file; then \
|
||||
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
||||
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
||||
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
||||
fi; \
|
||||
@@ -449,7 +454,7 @@ check: check-am
|
||||
all-am: Makefile $(PROGRAMS) $(DATA)
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"; do \
|
||||
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
||||
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||
done
|
||||
install: install-am
|
||||
install-exec: install-exec-am
|
||||
@@ -485,7 +490,7 @@ distclean: distclean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -f Makefile
|
||||
distclean-am: clean-am distclean-compile distclean-generic \
|
||||
- distclean-libtool distclean-tags
|
||||
+ distclean-tags
|
||||
|
||||
dvi: dvi-am
|
||||
|
||||
@@ -499,12 +504,20 @@ info-am:
|
||||
|
||||
install-data-am: install-appmanDATA
|
||||
|
||||
+install-dvi: install-dvi-am
|
||||
+
|
||||
install-exec-am: install-binPROGRAMS
|
||||
|
||||
+install-html: install-html-am
|
||||
+
|
||||
install-info: install-info-am
|
||||
|
||||
install-man:
|
||||
|
||||
+install-pdf: install-pdf-am
|
||||
+
|
||||
+install-ps: install-ps-am
|
||||
+
|
||||
installcheck-am:
|
||||
|
||||
maintainer-clean: maintainer-clean-am
|
||||
@@ -525,22 +538,29 @@ ps: ps-am
|
||||
|
||||
ps-am:
|
||||
|
||||
-uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
|
||||
- uninstall-info-am
|
||||
+uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS
|
||||
+
|
||||
+.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
|
||||
clean-generic clean-libtool clean-noinstPROGRAMS ctags \
|
||||
distclean distclean-compile distclean-generic \
|
||||
distclean-libtool distclean-tags distdir dvi dvi-am html \
|
||||
html-am info info-am install install-am install-appmanDATA \
|
||||
- install-binPROGRAMS install-data install-data-am install-exec \
|
||||
- install-exec-am install-info install-info-am install-man \
|
||||
+ install-binPROGRAMS install-data install-data-am install-dvi \
|
||||
+ install-dvi-am install-exec install-exec-am install-html \
|
||||
+ install-html-am install-info install-info-am install-man \
|
||||
+ install-pdf install-pdf-am install-ps install-ps-am \
|
||||
install-strip installcheck installcheck-am installdirs \
|
||||
maintainer-clean maintainer-clean-generic mostlyclean \
|
||||
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
|
||||
pdf pdf-am ps ps-am tags uninstall uninstall-am \
|
||||
- uninstall-appmanDATA uninstall-binPROGRAMS uninstall-info-am
|
||||
+ uninstall-appmanDATA uninstall-binPROGRAMS
|
||||
+
|
||||
|
||||
+@CROSS_COMPILING_TRUE@xmakestrs$(EXEEXT): makestrs.c
|
||||
+@CROSS_COMPILING_TRUE@ $(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
|
||||
+@CROSS_COMPILING_TRUE@ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
|
||||
|
||||
+
|
||||
.man.$(APP_MAN_SUFFIX):
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
$NetBSD: patch-ac,v 1.2 2007/09/20 08:30:15 rillig Exp $
|
||||
|
||||
--- src/Makefile.am 2006-12-19 04:40:53.000000000 +0100
|
||||
+++ src/Makefile.am 2007-07-27 21:30:16.000000000 +0200
|
||||
@@ -96,8 +96,15 @@
|
||||
|
|
|
@ -1,133 +1,17 @@
|
|||
--- src/Makefile.in 2007-01-28 07:31:13.000000000 +0100
|
||||
+++ src/Makefile.in 2007-07-27 21:31:01.000000000 +0200
|
||||
@@ -1,8 +1,8 @@
|
||||
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
|
||||
+# Makefile.in generated by automake 1.10 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
-# 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
@@ -14,15 +14,11 @@
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
-srcdir = @srcdir@
|
||||
-top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
-top_builddir = ..
|
||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||
-INSTALL = @INSTALL@
|
||||
install_sh_DATA = $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = $(install_sh) -c
|
||||
install_sh_SCRIPT = $(install_sh) -c
|
||||
@@ -69,17 +65,21 @@
|
||||
VarCreate.lo VarGet.lo Varargs.lo Vendor.lo sharedlib.lo
|
||||
nodist_libXt_la_OBJECTS = StringDefs.lo
|
||||
libXt_la_OBJECTS = $(am_libXt_la_OBJECTS) $(nodist_libXt_la_OBJECTS)
|
||||
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
||||
+libXt_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
||||
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(libXt_la_LDFLAGS) \
|
||||
+ $(LDFLAGS) -o $@
|
||||
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
|
||||
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
|
||||
- $(AM_CFLAGS) $(CFLAGS)
|
||||
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
||||
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
CCLD = $(CC)
|
||||
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
||||
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
|
||||
+ $(LDFLAGS) -o $@
|
||||
SOURCES = $(libXt_la_SOURCES) $(nodist_libXt_la_SOURCES)
|
||||
DIST_SOURCES = $(libXt_la_SOURCES)
|
||||
ETAGS = etags
|
||||
@@ -88,8 +88,6 @@
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
-AMDEP_FALSE = @AMDEP_FALSE@
|
||||
-AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
@@ -123,9 +121,8 @@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
+INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
-INSTALL_MAKESTRS_FALSE = @INSTALL_MAKESTRS_FALSE@
|
||||
-INSTALL_MAKESTRS_TRUE = @INSTALL_MAKESTRS_TRUE@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
@@ -138,12 +135,11 @@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
+MKDIR_P = $(mkdir_p)
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
@@ -166,13 +162,13 @@
|
||||
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
|
||||
XT_CFLAGS = @XT_CFLAGS@
|
||||
XT_LIBS = @XT_LIBS@
|
||||
+abs_builddir = @abs_builddir@
|
||||
+abs_srcdir = @abs_srcdir@
|
||||
+abs_top_builddir = @abs_top_builddir@
|
||||
+abs_top_srcdir = @abs_top_srcdir@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
am__quote = @am__quote@
|
||||
@@ -185,6 +181,7 @@
|
||||
build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
+builddir = @builddir@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
docdir = @docdir@
|
||||
@@ -212,8 +209,11 @@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
+srcdir = @srcdir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
+top_builddir = @top_builddir@
|
||||
+top_srcdir = @top_srcdir@
|
||||
lib_LTLIBRARIES = libXt.la
|
||||
BUILT_SOURCES = $(BUILT_FILES)
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
@@ -299,6 +299,8 @@
|
||||
$NetBSD: patch-ad,v 1.2 2007/09/20 08:30:15 rillig Exp $
|
||||
|
||||
--- src/Makefile.in.orig 2007-01-28 07:31:13.000000000 +0100
|
||||
+++ src/Makefile.in 2007-09-20 10:23:58.000000000 +0200
|
||||
@@ -103,6 +103,8 @@ CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
+CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
|
||||
+CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@@ -299,6 +301,8 @@ BUILT_SOURCE = StringDefs.c
|
||||
BUILT_HEADER = $(top_builddir)/include/X11/StringDefs.h $(top_builddir)/include/X11/Shell.h
|
||||
BUILT_FILES = $(BUILT_SOURCE) $(BUILT_HEADER)
|
||||
STRING_LIST = $(top_srcdir)/util/string.list
|
||||
|
@ -136,181 +20,7 @@
|
|||
all: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||
|
||||
@@ -335,7 +337,7 @@
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
|
||||
@$(NORMAL_INSTALL)
|
||||
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
|
||||
+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
|
||||
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
|
||||
if test -f $$p; then \
|
||||
f=$(am__strip_dir) \
|
||||
@@ -346,7 +348,7 @@
|
||||
|
||||
uninstall-libLTLIBRARIES:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
|
||||
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
|
||||
p=$(am__strip_dir) \
|
||||
echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
|
||||
$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
|
||||
@@ -361,7 +363,7 @@
|
||||
rm -f "$${dir}/so_locations"; \
|
||||
done
|
||||
libXt.la: $(libXt_la_OBJECTS) $(libXt_la_DEPENDENCIES)
|
||||
- $(LINK) -rpath $(libdir) $(libXt_la_LDFLAGS) $(libXt_la_OBJECTS) $(libXt_la_LIBADD) $(LIBS)
|
||||
+ $(libXt_la_LINK) -rpath $(libdir) $(libXt_la_OBJECTS) $(libXt_la_LIBADD) $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -426,22 +428,22 @@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sharedlib.Plo@am__quote@
|
||||
|
||||
.c.o:
|
||||
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
||||
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
||||
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
||||
|
||||
.c.obj:
|
||||
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
|
||||
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
||||
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
||||
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
||||
|
||||
.c.lo:
|
||||
-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
||||
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|
||||
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
||||
@@ -452,10 +454,6 @@
|
||||
clean-libtool:
|
||||
-rm -rf .libs _libs
|
||||
|
||||
-distclean-libtool:
|
||||
- -rm -f libtool
|
||||
-uninstall-info-am:
|
||||
-
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
unique=`for i in $$list; do \
|
||||
@@ -505,22 +503,21 @@
|
||||
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
||||
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
||||
- list='$(DISTFILES)'; for file in $$list; do \
|
||||
- case $$file in \
|
||||
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
|
||||
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
|
||||
- esac; \
|
||||
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
+ list='$(DISTFILES)'; \
|
||||
+ dist_files=`for file in $$list; do echo $$file; done | \
|
||||
+ sed -e "s|^$$srcdirstrip/||;t" \
|
||||
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
|
||||
+ case $$dist_files in \
|
||||
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
|
||||
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
|
||||
+ sort -u` ;; \
|
||||
+ esac; \
|
||||
+ for file in $$dist_files; do \
|
||||
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
||||
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
|
||||
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
|
||||
- dir="/$$dir"; \
|
||||
- $(mkdir_p) "$(distdir)$$dir"; \
|
||||
- else \
|
||||
- dir=''; \
|
||||
- fi; \
|
||||
if test -d $$d/$$file; then \
|
||||
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
||||
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
||||
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
||||
fi; \
|
||||
@@ -537,7 +534,7 @@
|
||||
all-am: Makefile $(LTLIBRARIES) all-local
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(libdir)"; do \
|
||||
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
||||
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||
done
|
||||
install: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) install-am
|
||||
@@ -576,7 +573,7 @@
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -f Makefile
|
||||
distclean-am: clean-am distclean-compile distclean-generic \
|
||||
- distclean-libtool distclean-tags
|
||||
+ distclean-tags
|
||||
|
||||
dvi: dvi-am
|
||||
|
||||
@@ -590,12 +587,20 @@
|
||||
|
||||
install-data-am:
|
||||
|
||||
+install-dvi: install-dvi-am
|
||||
+
|
||||
install-exec-am: install-libLTLIBRARIES
|
||||
|
||||
+install-html: install-html-am
|
||||
+
|
||||
install-info: install-info-am
|
||||
|
||||
install-man:
|
||||
|
||||
+install-pdf: install-pdf-am
|
||||
+
|
||||
+install-ps: install-ps-am
|
||||
+
|
||||
installcheck-am:
|
||||
|
||||
maintainer-clean: maintainer-clean-am
|
||||
@@ -616,20 +621,23 @@
|
||||
|
||||
ps-am:
|
||||
|
||||
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
|
||||
+uninstall-am: uninstall-libLTLIBRARIES
|
||||
+
|
||||
+.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
|
||||
clean-generic clean-libLTLIBRARIES clean-libtool ctags \
|
||||
distclean distclean-compile distclean-generic \
|
||||
distclean-libtool distclean-tags distdir dvi dvi-am html \
|
||||
html-am info info-am install install-am install-data \
|
||||
- install-data-am install-exec install-exec-am install-info \
|
||||
- install-info-am install-libLTLIBRARIES install-man \
|
||||
- install-strip installcheck installcheck-am installdirs \
|
||||
- maintainer-clean maintainer-clean-generic mostlyclean \
|
||||
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
|
||||
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
|
||||
- uninstall-info-am uninstall-libLTLIBRARIES
|
||||
+ install-data-am install-dvi install-dvi-am install-exec \
|
||||
+ install-exec-am install-html install-html-am install-info \
|
||||
+ install-info-am install-libLTLIBRARIES install-man install-pdf \
|
||||
+ install-pdf-am install-ps install-ps-am install-strip \
|
||||
+ installcheck installcheck-am installdirs maintainer-clean \
|
||||
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
||||
+ tags uninstall uninstall-am uninstall-libLTLIBRARIES
|
||||
|
||||
|
||||
all-local: $(BUILT_FILES)
|
||||
@@ -637,7 +645,7 @@
|
||||
@@ -637,7 +641,7 @@ all-local: $(BUILT_FILES)
|
||||
$(BUILT_HEADER): $(BUILT_SOURCE)
|
||||
|
||||
$(BUILT_SOURCE):
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
$NetBSD: patch-ae,v 1.2 2007/09/20 08:30:15 rillig Exp $
|
||||
|
||||
--- configure.ac 2007-01-28 07:27:22.000000000 +0100
|
||||
+++ configure.ac 2007-07-27 20:08:44.000000000 +0200
|
||||
@@ -95,6 +95,8 @@
|
||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue