diff options
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 7 |
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 @@ | |||
| 1 | 2008-02-09 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * Makefile.in (REGEXP_IN_LIBC): Remove reference to obsolete | ||
| 4 | variable. | ||
| 5 | |||
| 1 | 2008-02-08 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2008-02-08 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * emacsclient.c (decode_options): Pass --display implicitly if -c | 8 | * 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 | |||
| 382 | ./test-distrib ${srcdir}/testfile | 382 | ./test-distrib ${srcdir}/testfile |
| 383 | 383 | ||
| 384 | /* We need the following in order to create a <getopt.h> when the system | 384 | /* We need the following in order to create a <getopt.h> when the system |
| 385 | doesn't have one that works with the given compiler. */ | 385 | does not have one that works with the given compiler. */ |
| 386 | GETOPT_H = @GETOPT_H@ | 386 | GETOPT_H = @GETOPT_H@ |
| 387 | getopt.h: getopt_.h | 387 | getopt.h: getopt_.h |
| 388 | cp $(srcdir)/getopt_.h $@-t | 388 | cp $(srcdir)/getopt_.h $@-t |
| @@ -395,13 +395,8 @@ getopt.o: ${srcdir}/getopt.c $(GETOPT_H) ${srcdir}/gettext.h | |||
| 395 | getopt1.o: ${srcdir}/getopt1.c $(GETOPT_H) | 395 | getopt1.o: ${srcdir}/getopt1.c $(GETOPT_H) |
| 396 | ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c | 396 | ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c |
| 397 | 397 | ||
| 398 | #ifdef REGEXP_IN_LIBC | ||
| 399 | REGEXPOBJ = | ||
| 400 | REGEXPDEPS = | ||
| 401 | #else | ||
| 402 | REGEXPOBJ = regex.o | 398 | REGEXPOBJ = regex.o |
| 403 | REGEXPDEPS = $(REGEXPOBJ) $(srcdir)/../src/regex.h | 399 | REGEXPDEPS = $(REGEXPOBJ) $(srcdir)/../src/regex.h |
| 404 | #endif | ||
| 405 | 400 | ||
| 406 | regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h | 401 | regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h |
| 407 | ${CC} -c ${BASE_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c | 402 | ${CC} -c ${BASE_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c |