X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=Makefile;h=e9c4c30199341ffd45ed5342491e6cff62d25ebb;hb=cb1ef31fc377e6849c07ce78a176c6c84a41ab04;hp=7e4a44240bb2bc1a3cad91000165548a888baacb;hpb=b0fe77bc7df97af07c54a52ec34dabfeb83acc06;p=cparser

diff --git a/Makefile b/Makefile
index 7e4a442..e9c4c30 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ ICC_CFLAGS = -O0 -g3 -std=c99 -Wall -Werror
 ICC    ?= true
 GCCO1  ?= true
 
-LFLAGS = $(FIRM_LIBS)
+LFLAGS += $(FIRM_LIBS)
 
 SOURCES := \
 	adt/hashset.c \
@@ -26,13 +26,17 @@ 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 \
+	warning.c \
 	write_fluffy.c \
 	driver/firm_cmdline.c \
 	driver/firm_timing.c \
@@ -46,7 +50,7 @@ SPLINTS = $(addsuffix .splint, $(SOURCES))
 
 Q = @
 
-.PHONY : all clean dirs revision
+.PHONY : all clean dirs
 
 all: $(GOAL)
 
@@ -54,7 +58,17 @@ ifeq ($(findstring $(MAKECMDGOALS), clean depend),)
 -include .depend
 endif
 
-.depend: $(SOURCES) revision
+%.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
 
@@ -75,19 +89,10 @@ build/adt build/driver:
 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 $@
 
-revision:
-	@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
-
 clean:
 	@echo '===> CLEAN'
-	$(Q)rm -rf build $(GOAL) .depend
+	$(Q)rm -rf build/* $(GOAL) .depend