diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/commence.in | 15 | ||||
| -rw-r--r-- | config/conclude.in | 14 | ||||
| -rw-r--r-- | config/depend1.in (renamed from config/depend.in) | 20 | ||||
| -rw-r--r-- | config/depend2.in | 11 | ||||
| -rw-r--r-- | config/depend3.in | 7 | ||||
| -rw-r--r-- | config/depend4.in | 7 | ||||
| -rw-r--r-- | config/dependN.in | 4 | ||||
| -rw-r--r-- | config/gnu-flags | 2 |
8 files changed, 59 insertions, 21 deletions
diff --git a/config/commence.in b/config/commence.in index fdc5b6d..307b03e 100644 --- a/config/commence.in +++ b/config/commence.in @@ -9,6 +9,9 @@ .SUFFIXES: .c .o .lo @SET_MAKE@ +## Directories to serch +@SEARCH@ + ## Programs SHELL=/bin/sh CC=@CC@ @@ -105,10 +108,14 @@ all: STAMP1=$(top_builddir)/config/stamp1 STAMP2=$(top_builddir)/config/stamp2 -MAKEFILE_PARTS=$(srcdir)/Makefile.in \ - $(top_srcdir)/config/commence.in \ - $(top_srcdir)/config/conclude.in \ - $(top_srcdir)/config/depend.in +MAKEFILE_PARTS=$(srcdir)/Makefile.in \ + $(top_srcdir)/config/commence.in \ + $(top_srcdir)/config/conclude.in \ + $(top_srcdir)/config/depend1.in \ + $(top_srcdir)/config/depend2.in \ + $(top_srcdir)/config/depend3.in \ + $(top_srcdir)/config/depend4.in \ + $(top_srcdir)/config/dependN.in $(STAMP1): $(top_srcdir)/configure.in touch $(STAMP1) diff --git a/config/conclude.in b/config/conclude.in index 7e504c9..ec89061 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -170,15 +170,9 @@ maintainer-clean: distclean ##----------------------------------------------------------------------------- ## The following section of this makefile contains dependencies between the -## source files and the header files. If GNU make and GCC are being used then -## the dependencies are in the form of rules that cause the information to -## be kept updated automatically. Otherwise the dependencies are listed -## explicitly and come from the `.distdep' files in the various directories. -## These files are part of the distribution and are generated automatically on -## GNU/GCC systems. +## source files and the header files. ##----------------------------------------------------------------------------- +.PHONY: dep depend +dep depend: $(srcdir)/Dependencies -@DEPEND1@ -@DEPEND2@ -@DEPEND3@ -@DEPEND4@ +@DEPEND@ diff --git a/config/depend.in b/config/depend1.in index 8d41cf4..0e714b9 100644 --- a/config/depend.in +++ b/config/depend1.in @@ -20,13 +20,14 @@ ## otherwise the file is changed and a backup is saved by appending a ## tilde to the file name. ## -.PRECIOUS: .depend .distdep -dep depend: .distdep - -.distdep: .depend - touch .distdep - -srcdir=$(srcdir) perl -p $(top_srcdir)/bin/distdep .depend >.distdep +.PRECIOUS: $(srcdir)/Dependencies +$(srcdir)/Dependencies: .depend + -@echo '## This file is machine generated on GNU systems.' >$@ + -@echo '## Only temporary changes may be made here.' >>@ + -@echo >>@ + -srcdir=$(srcdir) perl -p $(top_srcdir)/bin/distdep .depend >>$@ +.PRECIOUS: .depend .depend: $(LIB_SRC) $(TEST_SRC) $(PROG_SRC) @touch .depend @for dep in $? dummy; do \ @@ -39,7 +40,12 @@ dep depend: .distdep sed 's/\.o/.lo/' >>$@; \ fi; \ done; - -perl -p $(top_srcdir)/bin/distdep .depend >$(srcdir)/.distdep + -@echo '## This file is machine generated on GNU systems.' \ + >$(srcdir)/Dependencies + -@echo '## Only temporary changes may be made here.' \ + >>$(srcdir)/Dependencies + -@echo >>$(srcdir)/Dependencies + -perl -p $(top_srcdir)/bin/distdep .depend >>$(srcdir)/Dependencies -include .depend diff --git a/config/depend2.in b/config/depend2.in new file mode 100644 index 0000000..f67914f --- /dev/null +++ b/config/depend2.in @@ -0,0 +1,11 @@ +## -*- makefile -*- + +## This platform doesn't support automatic dependencies because we're +## not using GNU gcc. GNU gcc is needed in order to generate the list +## of header files included by a source file. + +## Since automatic dependencies are not being used, we attempt to include the +## `.distdep' file from the source tree. This file was automatically generated +## on some system that satisfies the above requirements. + +-include $(srcdir)/Dependencies diff --git a/config/depend3.in b/config/depend3.in new file mode 100644 index 0000000..e856bc5 --- /dev/null +++ b/config/depend3.in @@ -0,0 +1,7 @@ +## -*- makefile -*- + +## Since automatic dependencies are not being used, we attempt to include the +## `.distdep' file from the source tree. This file was automatically generated +## on some system that satisfies the above requirements. + +.include <$(srcdir)/Dependencies> diff --git a/config/depend4.in b/config/depend4.in new file mode 100644 index 0000000..b0324d9 --- /dev/null +++ b/config/depend4.in @@ -0,0 +1,7 @@ +## -*- makefile -*- + +## Since automatic dependencies are not being used, we attempt to include the +## `.distdep' file from the source tree. This file was automatically generated +## on some system that satisfies the above requirements. + +include $(srcdir)/Dependencies diff --git a/config/dependN.in b/config/dependN.in new file mode 100644 index 0000000..7ece270 --- /dev/null +++ b/config/dependN.in @@ -0,0 +1,4 @@ +## -*- makefile -*- + +## Automatic dependencies are not being used and we cannot include other +## files. diff --git a/config/gnu-flags b/config/gnu-flags index 75c6c51..e34c375 100644 --- a/config/gnu-flags +++ b/config/gnu-flags @@ -27,6 +27,8 @@ if test X = "X$cc_flags_set"; then cc_vers_major=`echo $cc_version | cut -f1 -d.` cc_vers_minor=`echo $cc_version | cut -f2 -d.` cc_vers_patch=`echo $cc_version | cut -f3 -d.` + test -n "$cc_vers_major" || cc_vers_major=0 + test -n "$cc_vers_minor" || cc_vers_minor=0 test -n "$cc_vers_patch" || cc_vers_patch=0 cc_vers_all=`expr $cc_vers_major '*' 1000000 + $cc_vers_minor '*' 1000 + $cc_vers_patch` fi |