diff lib-src/Makefile.in.in @ 446:1ccc32a20af4 r21-2-38

Import from CVS: tag r21-2-38
author cvs
date Mon, 13 Aug 2007 11:37:21 +0200
parents abe6d1db359e
children 223736d75acb
line wrap: on
line diff
--- a/lib-src/Makefile.in.in	Mon Aug 13 11:36:20 2007 +0200
+++ b/lib-src/Makefile.in.in	Mon Aug 13 11:37:21 2007 +0200
@@ -160,7 +160,7 @@
 ## Where will the generated files like config.h be included from?
 ## This is also why you _must_ use <...> instead of "..." 
 ## when #include'ing generated files.
-cppflags = -Demacs -I. -I../src -I$(srcdir) -I$(top_srcdir)/src $(CPPFLAGS)
+cppflags = -I. -I../src -I$(srcdir) -I$(top_srcdir)/src $(CPPFLAGS)
 cflags   = $(CFLAGS) $(cppflags) $(c_switch_general)
 ldflags  = $(LDFLAGS) $(ld_switch_general) $(ld_libs_general)
 
@@ -281,7 +281,7 @@
 	${CC} -c $(cflags) ${srcdir}/../src/alloca.c
 
 regex.o: ${srcdir}/../src/regex.c ${top_srcdir}/src/regex.h
-	$(CC) -c `echo $(cflags) | sed 's/-Demacs/ /'` \
+	$(CC) -c $(cflags) \
 	-DINHIBIT_STRING_HEADER ${top_srcdir}/src/regex.c
 
 etags_args = $(cflags) -DVERSION='"${version}"' ${srcdir}/etags.c \
@@ -319,7 +319,7 @@
 	$(CC) $(cflags) ${srcdir}/make-docfile.c $(ldflags) -o $@
 
 digest-doc: ${srcdir}/digest-doc.c
-	$(CC) $(cflags) ${srcdir}/digest-doc.c $(ldflags) -o $@
+	$(CC) -Demacs $(cflags) ${srcdir}/digest-doc.c $(ldflags) -o $@
 
 sorted-doc: ${srcdir}/sorted-doc.c
 	$(CC) $(cflags) ${srcdir}/sorted-doc.c $(ldflags) -o $@
@@ -378,7 +378,7 @@
 ## because XEmacs provides built-in timer facilities.
 
 make-path: ${srcdir}/make-path.c ../src/config.h
-	$(CC) $(cflags) ${srcdir}/make-path.c -o $@
+	$(CC) -Demacs $(cflags) ${srcdir}/make-path.c -o $@
 
 ## These are NOT included in INSTALLABLES or UTILITIES.
 ## See ../src/Makefile.in.in.