X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=Makefile;h=34b231fca858a3986b503553a7109885900f3658;hb=ecaca9be5c2f5cddfa3c5b8c9df95792474f0ee9;hp=45920e374316c312d902e11d29a4bd1ab7888c7b;hpb=6fb5b6813ea936aee285ede3b7b2b096303a3a4c;p=cparser

diff --git a/Makefile b/Makefile
index 45920e3..34b231f 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,10 @@ CPPFLAGS += $(FIRM_CFLAGS)
 
 CFLAGS += -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Werror -std=c99 -pedantic
 CFLAGS += -O0 -g3
-ICC_CFLAGS = -O0 -g3 -std=c99 -Wall -Werror
 #CFLAGS += -O3 -march=pentium4 -fomit-frame-pointer -DNDEBUG
+#CFLAGS += -pg -O3 -fno-inline
+ICC_CFLAGS = -O0 -g3 -std=c99 -Wall -Werror
+#LFLAGS += -pg
 ICC    ?= true
 GCCO1  ?= true
 
@@ -23,9 +25,14 @@ LFLAGS += $(FIRM_LIBS)
 SOURCES := \
 	adt/hashset.c \
 	adt/strset.c \
+	adt/obstack.c \
+	adt/obstack_printf.c \
 	adt/xmalloc.c \
 	ast.c \
 	ast2firm.c \
+	diagnostic.c \
+	entitymap.c \
+	format_check.c \
 	lexer.c \
 	main.c \
 	parser.c \
@@ -34,7 +41,9 @@ SOURCES := \
 	type.c \
 	types.c \
 	type_hash.c \
+	warning.c \
 	write_fluffy.c \
+	write_caml.c \
 	driver/firm_cmdline.c \
 	driver/firm_timing.c \
 	driver/firm_codegen.c \
@@ -44,22 +53,31 @@ SOURCES := \
 OBJECTS = $(SOURCES:%.c=build/%.o)
 
 SPLINTS = $(addsuffix .splint, $(SOURCES))
+CPARSERS = $(addsuffix .cparser, $(SOURCES))
+CPARSEROS = $(SOURCES:%.c=build/cpb/%.o)
+CPARSEROS_E = $(SOURCES:%.c=build/cpbe/%.o)
+CPARSEROS2 = $(SOURCES:%.c=build/cpb2/%.o)
 
 Q = @
 
-.PHONY : all clean dirs
+all: $(DIRS) $(GOAL)
 
-all: $(GOAL)
+.PHONY: all clean dirs bootstrap bootstrap2
 
 ifeq ($(findstring $(MAKECMDGOALS), clean depend),)
 -include .depend
 endif
 
+config.h:
+	cp config.h.in $@
+
 %.h:
 	@true
 
-.depend: $(SOURCES)
-	@echo "#define cparser_REVISION \"`svnversion -n .`\"" > .revision.h
+REVISION ?= $(shell svnversion -n .)
+
+.depend: config.h $(SOURCES)
+	@echo "#define cparser_REVISION \"$(REVISION)\"" > .revision.h
 	$(Q)if diff -Nq .revision.h revision.h > /dev/null; then \
 	      rm .revision.h;                                    \
 	    else                                                 \
@@ -69,27 +87,71 @@ endif
 	@echo "===> DEPEND"
 	@rm -f $@ && touch $@ && makedepend -p "$@ build/" -Y -f $@ -- $(CPPFLAGS) -- $(SOURCES) 2> /dev/null && rm $@.bak
 
-$(GOAL): build/adt build/driver $(OBJECTS)
+DIRS = build build/adt build/driver build/cpb build/cpb/adt build/cpb/driver build/cpb2 build/cpb2/adt build/cpb2/driver build/cpbe build/cpbe/adt build/cpbe/driver
+UNUSED := $(shell mkdir -p $(DIRS))
+
+$(GOAL): $(OBJECTS)
 	@echo "===> LD $@"
 	$(Q)$(CC) $(OBJECTS) $(LFLAGS) -o $(GOAL)
 
 splint: $(SPLINTS)
 
+selfcheck: $(CPARSERS)
+
+bootstrap: build/cpb build/cpb/adt build/cpb/driver $(CPARSEROS) cparser.bootstrap
+
+bootstrape: build/cpb build/cpb/adt build/cpb/driver $(CPARSEROS_E) cparser.bootstrape
+
+bootstrap2: build/cpb2 build/cpb2/adt build/cpb2/driver $(CPARSEROS2) cparser.bootstrap2
+
 %.c.splint: %.c
 	@echo '===> SPLINT $<'
 	$(Q)splint $(CPPFLAGS) $<
 
-build/adt build/driver:
+%.c.cparser: %.c
+	@echo '===> CPARSER $<'
+	$(Q)./cparser $(CPPFLAGS) -fsyntax-only $<
+
+$(DIRS):
 	@echo "===> MKDIR $@"
 	$(Q)mkdir -p $@
 
+builtins.h: builtins/builtins.c
+	@echo '===> CREATE_BUILTINS $<'
+	$(Q)./create_builtins_h.sh > $@
+
+main.c: builtins.h
+
+build/cpb/%.o: %.c build/cparser
+	@echo '===> CPARSER $<'
+	$(Q)./build/cparser $(CPPFLAGS) -std=c99 -Wall -g3 -c $< -o $@
+
+build/cpbe/%.o: %.c
+	@echo '===> ECCP $<'
+	$(Q)eccp $(CPPFLAGS) -std=c99 -Wall -c $< -o $@
+
+build/cpb2/%.o: %.c cparser.bootstrap
+	@echo '===> CPARSER.BOOTSTRAP $<'
+	$(Q)./cparser.bootstrap $(CPPFLAGS) -Wall -g -c $< -o $@
+
+cparser.bootstrap: $(CPARSEROS)
+	@echo "===> LD $@"
+	$(Q)./build/cparser $(CPARSEROS) $(LFLAGS) -o $@
+
+cparser.bootstrape: $(CPARSEROS_E)
+	@echo "===> LD $@"
+	$(Q)gcc $(CPARSEROS_E) $(LFLAGS) -o $@
+
+cparser.bootstrap2: $(CPARSEROS2)
+	@echo "===> LD $@"
+	$(Q)./cparser.bootstrap $(CPARSEROS2) $(LFLAGS) -o $@
+
 build/%.o: %.c
 	@echo '===> CC $<'
-#-$(Q)build/cparser $(CPPFLAGS) $(CFLAGS) -fsyntax-only $<
-#$(Q)$(ICC) $(CPPFLAGS) $(ICC_CFLAGS) -c $< -o $@
-#	$(Q)$(GCCO1) $(CPPFLAGS) $(CFLAGS) -O1 -c $< -o $@
+	$(Q)$(ICC) $(CPPFLAGS) $(ICC_CFLAGS) -c $< -o $@
+	$(Q)$(GCCO1) $(CPPFLAGS) $(CFLAGS) -O1 -c $< -o $@
 	$(Q)$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
 clean:
 	@echo '===> CLEAN'
-	$(Q)rm -rf build $(GOAL) .depend
+	$(Q)rm -rf build/* $(GOAL) .depend