diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2009-12-28 18:35:21 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2009-12-28 18:35:54 +0100 |
| commit | 3bea3d5bc93593c9e31157475df77b4a6da00ad4 (patch) | |
| tree | 98a8d5cdb5a207eae3375f9d9c5a93cbc486180d | |
| parent | aa50fe4ff49b55e04bed9421b23748152c46911f (diff) | |
| download | patch-3bea3d5bc93593c9e31157475df77b4a6da00ad4.tar.gz | |
* Makefile.in (getopt.h, GETOPT_H): Generate getopt.h in the top-level
directory if needed.
(stdbool.h, STDBOOL_H): Likewise -- this should fix stdbool.h
generation on platforms which don't provide this header.
(argmatch.$(OBJEXT)): Add missing $(STDBOOL_H) dependency.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 17 |
2 files changed, 14 insertions, 9 deletions
@@ -17,6 +17,12 @@ declare strnlen here on systems which don't have it. * gl/lib/strnlen.c: Import from gnulib. + * Makefile.in (getopt.h, GETOPT_H): Generate getopt.h in the top-level + directory if needed. + (stdbool.h, STDBOOL_H): Likewise -- this should fix stdbool.h + generation on platforms which don't provide this header. + (argmatch.$(OBJEXT)): Add missing $(STDBOOL_H) dependency. + 2009-12-22 Andreas Gruenbacher <agruen@suse.de> * src/version.c (copyright_string): Add year 2009. diff --git a/Makefile.in b/Makefile.in index 04a72ce..af0997c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -45,9 +45,7 @@ OBJEXT = @OBJEXT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ STDBOOL_H = @STDBOOL_H@ -ifneq (@GETOPT_H@,) -GETOPT_H = gl/lib/@GETOPT_H@ -endif +GETOPT_H = @GETOPT_H@ HAVE__BOOL = @HAVE__BOOL@ ENABLE_MERGE = @ENABLE_MERGE@ @@ -262,7 +260,7 @@ config.hin: configure.ac $(srcdir)/aclocal.m4 # We need the following in order to create <getopt.h> when the system # doesn't have one that works with the given compiler. -gl/lib/getopt.h: gl/lib/getopt.hin +getopt.h: gl/lib/getopt.hin rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ cat $(srcdir)/gl/lib/getopt.hin; \ @@ -271,7 +269,8 @@ gl/lib/getopt.h: gl/lib/getopt.hin # We need the following in order to create <stdbool.h> when the system # doesn't have one that works. -gl/lib/stdbool.h: gl/lib/stdbool.hin +#gl/lib/stdbool.h: gl/lib/stdbool.hin +stdbool.h: gl/lib/stdbool.hin rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' \ @@ -325,7 +324,7 @@ TAGS: $(HDRS) $(SRCS) mostlyclean:: rm -f core* *core src/*.$(OBJEXT) gl/lib/*.$(OBJEXT) \ - gl/lib/stdbool.h gl/lib/getopt.h gl/lib/*.h-t + stdbool.h getopt.h gl/lib/*.h-t clean:: mostlyclean rm -f src/patch$(EXEEXT) @@ -372,8 +371,8 @@ $(OBJS): config.h COMMON = src/common.h $(STDBOOL_H) gl/lib/addext.$(OBJEXT): gl/lib/backupfile.h gl/lib/dirname.h -gl/lib/argmatch.$(OBJEXT): gl/lib/argmatch.h gl/lib/gettext.h gl/lib/error.h \ - gl/lib/quote.h gl/lib/quotearg.h gl/lib/unlocked-io.h +gl/lib/argmatch.$(OBJEXT): $(STDBOOL_H) gl/lib/argmatch.h gl/lib/gettext.h \ + gl/lib/error.h gl/lib/quote.h gl/lib/quotearg.h gl/lib/unlocked-io.h gl/lib/backupfile.$(OBJEXT): gl/lib/argmatch.h gl/lib/backupfile.h \ gl/lib/dirname.h gl/lib/basename.$(OBJEXT): gl/lib/dirname.h @@ -381,7 +380,7 @@ gl/lib/dirname.$(OBJEXT): gl/lib/dirname.h gl/lib/xalloc.h gl/lib/error.$(OBJEXT): gl/lib/error.h gl/lib/gettext.h gl/lib/unlocked-io.h gl/lib/exitfail.$(OBJEXT): gl/lib/exitfail.h gl/lib/full-write.$(OBJEXT): gl/lib/full-write.h gl/lib/safe-write.h -gl/lib/getopt.$(OBJEXT) gl/lib/getopt1.$(OBJEXT): gl/lib/getopt.h +gl/lib/getopt.$(OBJEXT) gl/lib/getopt1.$(OBJEXT): getopt.h gl/lib/hash.$(OBJEXT): $(STDBOOL_H) gl/lib/hash.h gl/lib/safe-read.$(OBJEXT): gl/lib/safe-write.h gl/lib/safe-write.$(OBJEXT): gl/lib/safe-read.c |