summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2008-02-09 07:42:06 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2008-02-09 07:42:06 +0000
commitdeeaffe11d28ca1b42e4f59c33a30d0e58698044 (patch)
treeb2d4bda90d751726d1bc07dcbea41a97e252aa0a /lib-src
parent05f2964e439fc44ceeaced760c7246fc966bf196 (diff)
downloademacs-deeaffe11d28ca1b42e4f59c33a30d0e58698044.tar.gz
* Makefile.in (REGEXP_IN_LIBC): Remove reference to obsolete
variable. * s/gnu-linux.h: Remove commented out code. * unexec.c: Remove references to obsolete variable COFF_ENCAPSULATE. * Makefile.in: Update what RMS says about using autoconf. (C_COMPILER): (COFF_ENCAPSULATE): (MAKE_PARALLEL): Remove obsolete variable. (C_SWITCH_MACHINE_1, C_SWITCH_SYSTEM_1, C_SWITCH_SITE_1): (C_SWITCH_X_SITE_1, C_SWITCH_X_MACHINE_1) (C_SWITCH_X_SYSTEM_1): Move invariant code outside conditional.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog5
-rw-r--r--lib-src/Makefile.in7
2 files changed, 6 insertions, 6 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index b7d362e615a..8b669dbdcd3 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-09 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * Makefile.in (REGEXP_IN_LIBC): Remove reference to obsolete
+ variable.
+
2008-02-08 Stefan Monnier <monnier@iro.umontreal.ca>
* emacsclient.c (decode_options): Pass --display implicitly if -c
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index f30e2e8c3ff..92691a3ad4f 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -382,7 +382,7 @@ test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
./test-distrib ${srcdir}/testfile
/* We need the following in order to create a <getopt.h> when the system
- doesn't have one that works with the given compiler. */
+ does not have one that works with the given compiler. */
GETOPT_H = @GETOPT_H@
getopt.h: getopt_.h
cp $(srcdir)/getopt_.h $@-t
@@ -395,13 +395,8 @@ getopt.o: ${srcdir}/getopt.c $(GETOPT_H) ${srcdir}/gettext.h
getopt1.o: ${srcdir}/getopt1.c $(GETOPT_H)
${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
-#ifdef REGEXP_IN_LIBC
-REGEXPOBJ =
-REGEXPDEPS =
-#else
REGEXPOBJ = regex.o
REGEXPDEPS = $(REGEXPOBJ) $(srcdir)/../src/regex.h
-#endif
regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h
${CC} -c ${BASE_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c