Remove \n from error messages.

[cparser] / Makefile

diff --git a/Makefile b/Makefile
index 88333e1..9f0401b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ endif
 CPPFLAGS  = -I.
 CPPFLAGS += $(FIRM_CPPFLAGS)
 
-CFLAGS += -Wall -W -Wstrict-prototypes -Wmissing-prototypes -std=c99 -pedantic
+CFLAGS += -Wall -W -Wstrict-prototypes -Wmissing-prototypes -std=c99
 CFLAGS_debug = -O0 -g
 CFLAGS_optimize = -O3 -fomit-frame-pointer -DNDEBUG
 CFLAGS_profile = -pg -O3 -fno-inline
@@ -31,9 +31,9 @@ CFLAGS += $(CFLAGS_$(variant))
 LFLAGS += $(FIRM_LIBS)
 
 SOURCES := \
-       adt/hashset.c \
        adt/strset.c \
        adt/strutil.c \
+       adt/pset_new.c \
        attribute.c \
        parser.c \
        ast.c \
@@ -47,7 +47,7 @@ SOURCES := \
        entitymap.c \
        format_check.c \
        input.c \
-       lexer.c \
+       jump_target.c \
        main.c \
        mangle.c \
        preprocessor.c \
@@ -62,7 +62,8 @@ SOURCES := \
        warning.c \
        walk.c \
        wrappergen/write_fluffy.c \
-       wrappergen/write_jna.c
+       wrappergen/write_jna.c \
+       wrappergen/write_compoundsizes.c
 
 OBJECTS = $(SOURCES:%.c=$(BUILDDIR)/%.o)
 DEPENDS = $(OBJECTS:%.o=%.d)
@@ -104,6 +105,7 @@ $(GOAL): $(LIBFIRM_FILE) $(OBJECTS)
        $(Q)$(CC) $(OBJECTS) $(LIBFIRM_FILE) -o $(GOAL) $(LFLAGS)
 
 ifneq ("$(LIBFIRM_FILE)", "")
+ifneq ("$(MAKECMDGOALS)", "clean")
 $(LIBFIRM_FILE): libfirm_subdir
 # Re-evaluate Makefile after libfirm_subdir has been executed
 Makefile: libfirm_subdir
@@ -111,6 +113,7 @@ Makefile: libfirm_subdir
 libfirm_subdir:
        $(Q)$(MAKE) -C $(FIRM_HOME) $(LIBFIRM_FILE_BASE)
 endif
+endif
 
 splint: $(SPLINTS)
 
@@ -160,4 +163,4 @@ $(BUILDDIR)/%.o: %.c
 
 clean:
        @echo '===> CLEAN'
-       $(Q)rm -rf $(BUILDDIR)/ $(GOAL)
+       $(Q)rm -rf $(OBJECTS) $(GOAL)