$NetBSD: patch-aa,v 1.3 2009/08/18 19:01:26 hasso Exp $

--- Makefile.orig	2009-05-15 15:14:07 +0300
+++ Makefile	2009-08-08 15:00:51 +0300
@@ -8,18 +8,18 @@ BUILDDIR ?= build
 FIRM_CFLAGS ?= `pkg-config --cflags libfirm`
 FIRM_LIBS   ?= `pkg-config --libs libfirm`
 
-CPPFLAGS  = -DHAVE_CONFIG_H -DFIRM_BACKEND
+CPPFLAGS += -DHAVE_CONFIG_H -DFIRM_BACKEND
 CPPFLAGS += -I.
 CPPFLAGS += $(FIRM_CFLAGS)
 
 CFLAGS += -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Werror -std=c99 -pedantic
-CFLAGS += -O0 -g3
+CFLAGS += ${COPTS} ${DBG}
 #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 -Werror
 #LFLAGS += -pg
-ICC    ?= true
-GCCO1  ?= true
+#ICC    ?= true
+#GCCO1  ?= true
 
 LFLAGS += $(FIRM_LIBS)
 
@@ -57,13 +57,13 @@ SOURCES := \
 	wrappergen/write_fluffy.c \
 	wrappergen/write_jna.c
 
-OBJECTS = $(SOURCES:%.c=build/%.o)
+OBJECTS = $(SOURCES:%.c=build/%.lo)
 
 SPLINTS = $(addsuffix .splint, $(SOURCES))
 CPARSERS = $(addsuffix .cparser, $(SOURCES))
-CPARSEROS = $(SOURCES:%.c=build/cpb/%.o)
-CPARSEROS_E = $(SOURCES:%.c=build/cpbe/%.o)
-CPARSEROS2 = $(SOURCES:%.c=build/cpb2/%.o)
+CPARSEROS = $(SOURCES:%.c=build/cpb/%.lo)
+CPARSEROS_E = $(SOURCES:%.c=build/cpbe/%.lo)
+CPARSEROS2 = $(SOURCES:%.c=build/cpb2/%.lo)
 
 Q = @
 
@@ -99,7 +99,8 @@ UNUSED := $(shell mkdir -p $(DIRS))
 
 $(GOAL): $(OBJECTS) $(LIBFIRM_FILE)
 	@echo "===> LD $@"
-	$(Q)$(CC) $(OBJECTS) $(LFLAGS) -o $(GOAL)
+	$(Q)$(LIBTOOL) --mode=link --tag=CC \
+		$(CC) $(OBJECTS) $(LFLAGS) -o $(GOAL)
 
 splint: $(SPLINTS)
 
@@ -129,35 +130,42 @@ builtins.h: builtins/builtins.c create_b
 
 main.c: builtins.h
 
-build/cpb/%.o: %.c build/cparser
+build/cpb/%.lo: %.c build/cparser
 	@echo '===> CPARSER $<'
-	$(Q)./build/cparser $(CPPFLAGS) -std=c99 -Wall -g3 -c $< -o $@
+	$(Q)$(LIBTOOL) --mode=compile --tag=CC \
+		./build/cparser $(CPPFLAGS) -std=c99 -Wall -g3 -c $< -o $@
 
-build/cpbe/%.o: %.c
+build/cpbe/%.lo: %.c
 	@echo '===> ECCP $<'
-	$(Q)eccp $(CPPFLAGS) -std=c99 -Wall -c $< -o $@
+	$(Q)$(LIBTOOL) --mode=compile --tag=CC \
+		eccp $(CPPFLAGS) -std=c99 -Wall -c $< -o $@
 
-build/cpb2/%.o: %.c cparser.bootstrap
+build/cpb2/%.lo: %.c cparser.bootstrap
 	@echo '===> CPARSER.BOOTSTRAP $<'
-	$(Q)./cparser.bootstrap $(CPPFLAGS) -Wall -g -c $< -o $@
+	$(Q)$(LIBTOOL) --mode=compile --tag=CC \
+		./cparser.bootstrap $(CPPFLAGS) -Wall -g -c $< -o $@
 
 cparser.bootstrap: $(CPARSEROS)
 	@echo "===> LD $@"
-	$(Q)./build/cparser $(CPARSEROS) $(LFLAGS) -o $@
+	$(Q)$(LIBTOOL) --mode=link \
+		./build/cparser $(CPARSEROS) $(LFLAGS) -o $@
 
 cparser.bootstrape: $(CPARSEROS_E)
 	@echo "===> LD $@"
-	$(Q)gcc $(CPARSEROS_E) $(LFLAGS) -o $@
+	$(Q)$(LIBTOOL) --mode=link \
+		gcc $(CPARSEROS_E) $(LFLAGS) -o $@
 
 cparser.bootstrap2: $(CPARSEROS2)
 	@echo "===> LD $@"
-	$(Q)./cparser.bootstrap $(CPARSEROS2) $(LFLAGS) -o $@
+	$(Q)$(LIBTOOL) --mode=link \
+		./cparser.bootstrap $(CPARSEROS2) $(LFLAGS) -o $@
 
-build/%.o: %.c
+build/%.lo: %.c
 	@echo '===> CC $<'
 #$(Q)$(ICC) $(CPPFLAGS) $(ICC_CFLAGS) -c $< -o $@
 #$(Q)$(GCCO1) $(CPPFLAGS) $(CFLAGS) -O1 -c $< -o $@
-	$(Q)$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+	$(Q)$(LIBTOOL) --mode=compile --tag=CC \
+		$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
 clean:
 	@echo '===> CLEAN'