X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=Makefile;h=963fa2f7529f8521a5f209e9839d3ec9cffb058c;hb=81cec364f594acfb54f82bd574b5d823e5058193;hp=2e85c3bba6a7e1066325ce47b998a731212a47ac;hpb=54a352eb0507b79e5cf0c912504c0debc8a2fa24;p=cparser

diff --git a/Makefile b/Makefile
index 2e85c3b..963fa2f 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,16 +25,22 @@ 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 \
+	format_check.c \
 	lexer.c \
 	main.c \
 	parser.c \
 	symbol_table.c \
 	token.c \
 	type.c \
+	types.c \
 	type_hash.c \
+	warning.c \
 	write_fluffy.c \
 	driver/firm_cmdline.c \
 	driver/firm_timing.c \
@@ -43,12 +51,15 @@ SOURCES := \
 OBJECTS = $(SOURCES:%.c=build/%.o)
 
 SPLINTS = $(addsuffix .splint, $(SOURCES))
+CPARSERS = $(addsuffix .cparser, $(SOURCES))
+CPARSEROS = $(SOURCES:%.c=build/cpb/%.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
@@ -68,27 +79,55 @@ 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
+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
+
+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 $@
 
+build/cpb/%.o: %.c build/cparser
+	@echo '===> CPARSER $<'
+	$(Q)./build/cparser $(CPPFLAGS) -Wall -g -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)$(CC) $(CPARSEROS) $(LFLAGS) -o $@
+
+cparser.bootstrap2: $(CPARSEROS2)
+	@echo "===> LD $@"
+	$(Q)$(CC) $(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