rewrite of attribute handling

[cparser] / Makefile

diff --git a/Makefile b/Makefile
index 017f797..395c693 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,32 +24,37 @@ LFLAGS += $(FIRM_LIBS)
 
 SOURCES := \
        adt/hashset.c \
-       adt/strset.c \
        adt/obstack.c \
        adt/obstack_printf.c \
+       adt/strset.c \
        adt/xmalloc.c \
+       attribute.c \
+       parser.c \
        ast.c \
        ast2firm.c \
-       config.h \
        diagnostic.c \
+       driver/firm_cmdline.c \
+       driver/firm_codegen.c \
+       driver/firm_opt.c \
+       driver/firm_timing.c \
+       driver/gen_firm_asm.c \
+       entity.c \
        entitymap.c \
        format_check.c \
        lexer.c \
        main.c \
-       parser.c \
+       mangle.c \
+       preprocessor.c \
        symbol_table.c \
        token.c \
        type.c \
-       types.c \
        type_hash.c \
+       types.c \
+       walk_statements.c \
        warning.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_caml.c \
+       wrappergen/write_fluffy.c \
+       wrappergen/write_jna.c
 
 OBJECTS = $(SOURCES:%.c=build/%.o)
 
@@ -75,8 +80,10 @@ config.h:
 %.h:
        @true
 
-.depend: $(SOURCES)
-       @echo "#define cparser_REVISION \"`svnversion -n .`\"" > .revision.h
+REVISION ?= $(shell svnversion -n .)
+
+.depend: config.h $(SOURCES)
+       @echo "#define cparser_REVISION \"$(REVISION)\"" > .revision.h
        $(Q)if diff -Nq .revision.h revision.h > /dev/null; then \
              rm .revision.h;                                    \
            else                                                 \
@@ -86,10 +93,10 @@ config.h:
        @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)
+$(GOAL): $(OBJECTS) $(LIBFIRM_FILE)
        @echo "===> LD $@"
        $(Q)$(CC) $(OBJECTS) $(LFLAGS) -o $(GOAL)
 
@@ -115,7 +122,7 @@ $(DIRS):
        @echo "===> MKDIR $@"
        $(Q)mkdir -p $@
 
-builtins.h: builtins/builtins.c
+builtins.h: builtins/builtins.c create_builtins_h.sh
        @echo '===> CREATE_BUILTINS $<'
        $(Q)./create_builtins_h.sh > $@
 
@@ -147,10 +154,10 @@ cparser.bootstrap2: $(CPARSEROS2)
 
 build/%.o: %.c
        @echo '===> CC $<'
-       $(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 builtins.h build/* $(GOAL) .depend