diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-08 13:02:38 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-08 13:02:38 -0800 |
| commit | 9a514d4a6c27b837fc2cd6d02c7cd60f08a621a4 (patch) | |
| tree | 1eee202635acdcbf6871101a2af8f67cd4683b1c /lib-src | |
| parent | 278f68456b8c25fff6d2274476cdc8ee3609f68b (diff) | |
| download | emacs-9a514d4a6c27b837fc2cd6d02c7cd60f08a621a4.tar.gz | |
Automate syncing from gnulib.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 10 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 12 |
2 files changed, 20 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index b5869b322d7..7da5d2104ee 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,5 +1,15 @@ 2011-01-08 Paul Eggert <eggert@cs.ucla.edu> + Automate syncing from gnulib. + * Makefile.in (EXE_FILES): New macro. + (BASE_CFLAGS): Add -I../lib and -I${srcdir}/../lib, + for gnulib's .h files. + (LOADLIBES): Add ../lib/libgnu.a. + ($(EXE_FILES)): Depend on ../lib/libgnu.a. + (../lib/libgnu.a): New rule. + +2011-01-08 Paul Eggert <eggert@cs.ucla.edu> + * Makefile.in (EXECUTABLES): Remove; macro unused since 1993. 2011-01-08 Glenn Morris <rgm@gnu.org> diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 5561c04b66a..fc404c5ae63 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -128,6 +128,9 @@ DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT} SCRIPTS= rcs2log vcdiff STAMP_SCRIPTS= stamp-rcs2log stamp-vcdiff +# All files that are created by the linker, i.e., whose names end in ${EXEEXT}. +EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL} + # Specify additional -D flags for movemail. Options: # -DMAIL_USE_FLOCK or -DMAIL_USE_LOCKF (use flock or lockf for file locking). # See the comments about locking in movemail.c. Normally the values @@ -166,13 +169,15 @@ LIBS_SYSTEM = @LIBS_SYSTEM@ # defined before they know they can take advantage of the information # in ../src/config.h. BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) ${C_WARNINGS_SWITCH} \ - -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src + -DHAVE_CONFIG_H -I. -I../src -I../lib \ + -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} -LOADLIBES=$(LIBS_SYSTEM) +LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM) +$(EXE_FILES): ../lib/libgnu.a ## This is the default compilation command. ## But we should never rely on it, because some make version failed to @@ -320,6 +325,9 @@ getopt.o: ${srcdir}/getopt.c $(GETOPT_H) ${srcdir}/gettext.h getopt1.o: ${srcdir}/getopt1.c $(GETOPT_H) ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c +../lib/libgnu.a: ../src/config.h + cd ../lib && $(MAKE) libgnu.a + REGEXPOBJ = regex.o REGEXPDEPS = $(REGEXPOBJ) $(srcdir)/../src/regex.h |