X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=Makefile;h=963fa2f7529f8521a5f209e9839d3ec9cffb058c;hb=5c1f4f4c1fb16d5c4d6de6f8e12b520e2a7f265e;hp=7f489c77ed04c3548c66003904a5602f84ad572c;hpb=8ad66cf6f7cfbebda265ca9b258d2b39d50b118b;p=cparser

diff --git a/Makefile b/Makefile
index 7f489c7..963fa2f 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ CFLAGS += -O0 -g3
 #CFLAGS += -O3 -march=pentium4 -fomit-frame-pointer -DNDEBUG
 #CFLAGS += -pg -O3 -fno-inline
 ICC_CFLAGS = -O0 -g3 -std=c99 -Wall -Werror
-LFLAGS += -pg
+#LFLAGS += -pg
 ICC    ?= true
 GCCO1  ?= true
 
@@ -53,12 +53,13 @@ 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
@@ -78,14 +79,12 @@ endif
 	@echo "===> DEPEND"
 	@rm -f $@ && touch $@ && makedepend -p "$@ build/" -Y -f $@ -- $(CPPFLAGS) -- $(SOURCES) 2> /dev/null && rm $@.bak
 
-$(GOAL): build/adt build/driver $(OBJECTS)
-	@echo "===> LD $@"
-	$(Q)$(CC) $(OBJECTS) $(LFLAGS) -o $(GOAL)
+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))
 
-cparser.bootstrap: $(CPARSEROS)
+$(GOAL): $(OBJECTS)
 	@echo "===> LD $@"
-	$(Q)$(CC) $(CPARSEROS) $(LFLAGS) -o $@
-
+	$(Q)$(CC) $(OBJECTS) $(LFLAGS) -o $(GOAL)
 
 splint: $(SPLINTS)
 
@@ -93,6 +92,8 @@ 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) $<
@@ -101,17 +102,28 @@ bootstrap: build/cpb build/cpb/adt build/cpb/driver $(CPARSEROS) cparser.bootstr
 	@echo '===> CPARSER $<'
 	$(Q)./cparser $(CPPFLAGS) -fsyntax-only $<
 
-build/adt build/driver build/cpb build/cpb/adt build/cpb/driver:
+$(DIRS):
 	@echo "===> MKDIR $@"
 	$(Q)mkdir -p $@
 
-build/cpb/%.o: %.c
+build/cpb/%.o: %.c build/cparser
 	@echo '===> CPARSER $<'
-	$(Q)./cparser $(CPPFLAGS) -Wall -c $< -o $@
+	$(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)$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@