aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/Makefile.in14
-rw-r--r--gcc/unprotoize.c1
3 files changed, 13 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3ebb18d..c1302c6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jan 7 12:05:51 1998 Bruno Haible <bruno@linuix.mathematik.uni-karlsruhe.de>
+
+ * Makefile.in (stamp-proto): Remove.
+ (protoize.o, unprotoize.o): Straightforward compile.
+ * unprotoize.c: Define UNPROTOIZE here, not in the Makefile.
+
Tue Jan 13 21:59:39 1998 Mumit Khan <khan@xraylith.wisc.edu>
* i386/cygwin32.h (STRIP_NAME_ENCODING): Define for Win32 to strip
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index d79d58a..7ff739d 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -613,7 +613,7 @@ STAGESTUFF = *$(objext) insn-flags.h insn-config.h insn-codes.h \
insn-attr.h insn-attrtab.c insn-opinit.c \
stamp-flags stamp-config stamp-codes stamp-mlib \
stamp-output stamp-recog stamp-emit stamp-extract stamp-peep \
- stamp-attr stamp-attrtab stamp-opinit stamp-proto stamp-crt stamp-crtS stamp-crt0 \
+ stamp-attr stamp-attrtab stamp-opinit stamp-crt stamp-crtS stamp-crt0 \
genemit$(build_exeext) genoutput$(build_exeext) genrecog$(build_exeext) \
genextract$(build_exeext) genflags$(build_exeext) gencodes$(build_exeext) \
genconfig$(build_exeext) genpeep$(build_exeext) genattrtab$(build_exeext) \
@@ -1862,16 +1862,14 @@ protoize: protoize.o getopt.o getopt1.o getpwd.o version.o \
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
protoize.o getopt.o getopt1.o getpwd.o version.o \
pexecute.o choose-temp.o $(LIBS)
-protoize.o: stamp-proto ; @true
unprotoize: unprotoize.o getopt.o getopt1.o getpwd.o version.o \
pexecute.o choose-temp.o $(LIBDEPS)
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
unprotoize.o getopt.o getopt1.o getpwd.o version.o \
pexecute.o choose-temp.o $(LIBS)
-unprotoize.o: stamp-proto ; @true
-stamp-proto: protoize.c getopt.h $(CONFIG_H)
+protoize.o: protoize.c getopt.h $(CONFIG_H)
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
-DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
@@ -1879,8 +1877,9 @@ stamp-proto: protoize.c getopt.h $(CONFIG_H)
-DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
-DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
-DSTD_PROTO_DIR=\"$(libsubdir)\" \
- -DUNPROTOIZE $(srcdir)/protoize.c
- mv protoize$(objext) unprotoize$(objext)
+ $(srcdir)/protoize.c
+
+unprotoize.o: unprotoize.c protoize.c getopt.h $(CONFIG_H)
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
-DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
@@ -1888,8 +1887,7 @@ stamp-proto: protoize.c getopt.h $(CONFIG_H)
-DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
-DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
-DSTD_PROTO_DIR=\"$(libsubdir)\" \
- $(srcdir)/protoize.c
- touch stamp-proto
+ $(srcdir)/unprotoize.c
getopt.o: getopt.c getopt.h
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/getopt.c
diff --git a/gcc/unprotoize.c b/gcc/unprotoize.c
index bfdb7d2..ce3ee7b 100644
--- a/gcc/unprotoize.c
+++ b/gcc/unprotoize.c
@@ -1 +1,2 @@
#include "protoize.c"
+#define UNPROTOIZE