X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=d0f3a6c72bc56ea10045112aa9862336ffc7ea1d;hb=b3918a0deed6cf925866b6c076fade593e3db55d;hp=3812b37052255bc9c4d0f866ddc964ec94b98455;hpb=61bb8cbf62e7ca43ca99859159cc159bdb6c405c;p=cparser

diff --git a/Makefile b/Makefile
index 3812b37..d0f3a6c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,11 @@
-GOAL = cparser
+-include config.mak
 
-FIRM_HOME = $(HOME)/projects/firm
-FIRM_BUILD = $(FIRM_HOME)/build/i686-pc-linux-gnu/debug/
-FIRM_CFLAGS = -I$(FIRM_HOME)/libfirm/include -I$(FIRM_HOME)/obstack -I$(FIRM_HOME)/libcore -I$(FIRM_HOME)/libcore/libcore -I$(FIRM_HOME)
-FIRM_LIBS = -L$(FIRM_BUILD) -lfirm -llpp -lcore -lm -lz
+GOAL = $(BUILDDIR)/cparser
+
+BUILDDIR ?= build
+
+FIRM_CFLAGS ?= `pkg-config --cflags libfirm`
+FIRM_LIBS   ?= `pkg-config --libs libfirm`
 
 CPPFLAGS  = -DHAVE_CONFIG_H -DFIRM_BACKEND
 CPPFLAGS += -I.
@@ -13,8 +15,10 @@ CFLAGS += -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Werror -std=c99 -pe
 CFLAGS += -O0 -g3
 ICC_CFLAGS = -O0 -g3 -std=c99 -Wall -Werror
 #CFLAGS += -O3 -march=pentium4 -fomit-frame-pointer -DNDEBUG
+ICC    ?= true
+GCCO1  ?= true
 
-LFLAGS = $(FIRM_LIBS)
+LFLAGS += $(FIRM_LIBS)
 
 SOURCES := \
 	adt/hashset.c \
@@ -22,14 +26,22 @@ SOURCES := \
 	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 \
-	write_fluffy.c
+	write_fluffy.c \
+	driver/firm_cmdline.c \
+	driver/firm_timing.c \
+	driver/firm_codegen.c \
+	driver/firm_opt.c \
+	driver/gen_firm_asm.c \
 
 OBJECTS = $(SOURCES:%.c=build/%.o)
 
@@ -45,11 +57,21 @@ ifeq ($(findstring $(MAKECMDGOALS), clean depend),)
 -include .depend
 endif
 
+%.h:
+	@true
+
 .depend: $(SOURCES)
+	@echo "#define cparser_REVISION \"`svnversion -n .`\"" > .revision.h
+	$(Q)if diff -Nq .revision.h revision.h > /dev/null; then \
+	      rm .revision.h;                                    \
+	    else                                                 \
+	      echo "===> UPDATING revision.h";                   \
+	      mv .revision.h revision.h;                         \
+	    fi
 	@echo "===> DEPEND"
 	@rm -f $@ && touch $@ && makedepend -p "$@ build/" -Y -f $@ -- $(CPPFLAGS) -- $(SOURCES) 2> /dev/null && rm $@.bak
 
-$(GOAL): build/adt $(OBJECTS)
+$(GOAL): build/adt build/driver $(OBJECTS)
 	@echo "===> LD $@"
 	$(Q)$(CC) $(OBJECTS) $(LFLAGS) -o $(GOAL)
 
@@ -59,15 +81,17 @@ splint: $(SPLINTS)
 	@echo '===> SPLINT $<'
 	$(Q)splint $(CPPFLAGS) $<
 
-build/adt:
+build/adt build/driver:
 	@echo "===> MKDIR $@"
 	$(Q)mkdir -p $@
 
 build/%.o: %.c
 	@echo '===> CC $<'
-	$(Q)icc $(CPPFLAGS) $(ICC_CFLAGS) -c $< -o $@
+#-$(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 $@
 
 clean:
 	@echo '===> CLEAN'
-	$(Q)rm -rf build $(GOAL) .depend
+	$(Q)rm -rf build/* $(GOAL) .depend