X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=Makefile;h=76cad92625db577c4714980d090d57c81f1646ec;hb=c4cbd607a4bc2655c08300e565250978713508ab;hp=1ddff635cec937aabc92abad251e54ccd0a9482a;hpb=e97bf80ad2ba7f01d4a2b51d243d6273ae2d65a1;p=cparser

diff --git a/Makefile b/Makefile
index 1ddff63..76cad92 100644
--- a/Makefile
+++ b/Makefile
@@ -7,15 +7,14 @@ BUILDDIR ?= build
 FIRM_CFLAGS ?= `pkg-config --cflags libfirm`
 FIRM_LIBS   ?= `pkg-config --libs libfirm`
 
-CPPFLAGS  = -DHAVE_CONFIG_H -DFIRM_BACKEND
-CPPFLAGS += -I.
+CPPFLAGS  = -I.
 CPPFLAGS += $(FIRM_CFLAGS)
 
-CFLAGS += -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Werror -std=c99 -pedantic
-CFLAGS += -O0 -g3
+CFLAGS += -Wall -W -Wstrict-prototypes -Wmissing-prototypes -std=c99 -pedantic
+CFLAGS += -O2 -g
 #CFLAGS += -O3 -march=pentium4 -fomit-frame-pointer -DNDEBUG
 #CFLAGS += -pg -O3 -fno-inline
-ICC_CFLAGS = -O0 -g3 -std=c99 -Wall -Werror
+ICC_CFLAGS = -O0 -g3 -std=c99 -Wall
 #LFLAGS += -pg
 ICC    ?= true
 GCCO1  ?= true
@@ -25,31 +24,33 @@ LFLAGS += $(FIRM_LIBS)
 SOURCES := \
 	adt/hashset.c \
 	adt/strset.c \
-	adt/obstack.c \
-	adt/obstack_printf.c \
-	adt/xmalloc.c \
+	attribute.c \
+	parser.c \
 	ast.c \
+	ast2firm.c \
+	builtins.c \
 	diagnostic.c \
+	driver/firm_cmdline.c \
+	driver/firm_machine.c \
+	driver/firm_opt.c \
+	driver/firm_timing.c \
+	entity.c \
 	entitymap.c \
 	format_check.c \
 	lexer.c \
 	main.c \
-	walk_statements.c \
+	mangle.c \
+	preprocessor.c \
+	printer.c \
 	symbol_table.c \
 	token.c \
 	type.c \
-	types.c \
 	type_hash.c \
+	types.c \
+	walk_statements.c \
 	warning.c \
-	parser.c \
-	ast2firm.c \
-	write_fluffy.c \
-	write_caml.c \
-	driver/firm_cmdline.c \
-	driver/firm_timing.c \
-	driver/firm_codegen.c \
-	driver/firm_opt.c \
-	driver/gen_firm_asm.c \
+	wrappergen/write_fluffy.c \
+	wrappergen/write_jna.c
 
 OBJECTS = $(SOURCES:%.c=build/%.o)
 
@@ -61,9 +62,9 @@ CPARSEROS2 = $(SOURCES:%.c=build/cpb2/%.o)
 
 Q = @
 
-all: $(DIRS) $(GOAL)
+all: $(GOAL)
 
-.PHONY: all clean dirs bootstrap bootstrap2
+.PHONY: all clean bootstrap bootstrap2
 
 ifeq ($(findstring $(MAKECMDGOALS), clean depend),)
 -include .depend
@@ -77,7 +78,8 @@ config.h:
 
 REVISION ?= $(shell svnversion -n .)
 
-.depend: config.h $(SOURCES)
+revision.h:
+	@echo "===> GEN $@"
 	@echo "#define cparser_REVISION \"$(REVISION)\"" > .revision.h
 	$(Q)if diff -Nq .revision.h revision.h > /dev/null; then \
 	      rm .revision.h;                                    \
@@ -85,10 +87,12 @@ REVISION ?= $(shell svnversion -n .)
 	      echo "===> UPDATING revision.h";                   \
 	      mv .revision.h revision.h;                         \
 	    fi
+
+.depend: config.h revision.h $(SOURCES)
 	@echo "===> DEPEND"
 	@rm -f $@ && touch $@ && makedepend -p "$@ build/" -Y -f $@ -- $(CPPFLAGS) -- $(SOURCES) 2> /dev/null && rm $@.bak
 
-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
+DIRS = build build/adt build/driver build/wrappergen build/cpb build/cpb/adt build/cpb/driver build/cpb/wrappergen build/cpb2 build/cpb2/adt build/cpb2/driver build/cpb2/wrappergen build/cpbe build/cpbe/adt build/cpbe/driver build/cpbe2/wrappergen
 UNUSED := $(shell mkdir -p $(DIRS))
 
 $(GOAL): $(OBJECTS) $(LIBFIRM_FILE)
@@ -113,15 +117,11 @@ bootstrap2: build/cpb2 build/cpb2/adt build/cpb2/driver $(CPARSEROS2) cparser.bo
 	@echo '===> CPARSER $<'
 	$(Q)./cparser $(CPPFLAGS) -fsyntax-only $<
 
-$(DIRS):
-	@echo "===> MKDIR $@"
-	$(Q)mkdir -p $@
-
-builtins.h: builtins/builtins.c create_builtins_h.sh
+gen_builtins.h: builtins/builtins.c create_builtins_h.sh
 	@echo '===> CREATE_BUILTINS $<'
-	$(Q)./create_builtins_h.sh > $@
+	$(Q)./create_builtins_h.sh "$<" > $@
 
-main.c: builtins.h
+main.c: gen_builtins.h
 
 build/cpb/%.o: %.c build/cparser
 	@echo '===> CPARSER $<'
@@ -155,4 +155,4 @@ build/%.o: %.c
 
 clean:
 	@echo '===> CLEAN'
-	$(Q)rm -rf build/* $(GOAL) .depend
+	$(Q)rm -rf gen_builtins.h build/* $(GOAL) .depend