Package: openhackware
Version: 0.4.1
Author: Guillem Jover <guillem@hadrons.org>
Status: not-sent
Description:
 Make CFLAGS and LDFLAGS user settable.

diff -Naur Makefile Makefile
--- Makefile	2005-03-31 10:23:33.000000000 +0300
+++ Makefile	2005-05-23 22:05:55.071912832 +0300
@@ -44,12 +44,14 @@
 SRCDIR:= src
 
 CC_BASE:= $(shell $(CC) -print-search-dirs | grep install | sed -e 's/.*\ //')
-CFLAGS= -Wall -W -Werror -O2 -g -fno-builtin -fno-common -nostdinc -mregnames
-CFLAGS+= -DBUILD_DATE=$(BUILD_DATE) -DBUILD_TIME=$(BUILD_TIME)
-CFLAGS+= -I$(SRCDIR)/ -I$(SRCDIR)/libc/include -I$(CC_BASE)/include
-CFLAGS+= -I$(SRCDIR)/dev -I$(SRCDIR)/dev/block -I$(SRCDIR)/dev/char
-CFLAGS+= -I$(SRCDIR)/dev/bus
-LDFLAGS= -O2 -g -nostdlib
+CFLAGS= -Wall -W -Werror -O2 -g
+DEF_CFLAGS= $(CFLAGS) -fno-builtin -fno-common -nostdinc -mregnames
+DEF_CFLAGS+= -DBUILD_DATE=$(BUILD_DATE) -DBUILD_TIME=$(BUILD_TIME)
+DEF_CFLAGS+= -I$(SRCDIR)/ -I$(SRCDIR)/libc/include -I$(CC_BASE)/include
+DEF_CFLAGS+= -I$(SRCDIR)/dev -I$(SRCDIR)/dev/block -I$(SRCDIR)/dev/char
+DEF_CFLAGS+= -I$(SRCDIR)/dev/bus
+LDFLAGS= -O2 -g
+DEF_LDFLAGS= $(LDFLAGS) -nostdlib
 
 BIOS_IMAGE_BITS:= 19
 BIOS_IMAGE_SIZE:= $(shell echo $$(( 1 << $(BIOS_IMAGE_BITS) )) )
@@ -113,8 +115,8 @@
 main.out_OBJS+= $(addprefix $(OBJDIR)/dev_, $(dev_OBJS))
 
 CUR= $(notdir $@)
-CFLAGS+= $($(CUR)_CFLAGS)
-LDFLAGS+= $($(CUR)_LDFLAGS)
+DEF_CFLAGS+= $($(CUR)_CFLAGS)
+DEF_LDFLAGS+= $($(CUR)_LDFLAGS)
 
 BIN_TARGETS:= $(OBJDIR)/vectors.bin $(OBJDIR)/main.bin $(OBJDIR)/boot.bin
 TARGET:= ppc_rom.bin
@@ -156,79 +158,81 @@
 	$(OBJCOPY) -O binary $($(notdir $@)_OPTIONS) $< $@
 
 $(OBJDIR)/%.out: $(OBJDIR)/%.o $(SRCDIR)/%.ld
-	$(LD) $(LDFLAGS) -o $@ $<
+	$(LD) $(DEF_LDFLAGS) -o $@ $<
 
 $(OBJDIR)/main.out: $(main.out_OBJS) $(SRCDIR)/main.ld
-	$(LD) $(LDFLAGS) -o $@ $(main.out_OBJS)
+	$(LD) $(DEF_LDFLAGS) -o $@ $($(notdir $@)_OBJS)
 
 $(OBJDIR)/%.o: $(SRCDIR)/%.c $(SRCDIR)/bios.h
 	@$(DEBUG) "CFLAGS  = $(CFLAGS)"
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CC) -c $(DEF_CFLAGS) -o $@ $<
 
 $(OBJDIR)/%.o: $(SRCDIR)/%.S $(SRCDIR)/bios.h
 	@$(DEBUG) "CFLAGS  = $(CFLAGS)"
-	$(CC) -c $(CFLAGS) -Wa,-mregnames -o $@ $<
+	$(CC) -c $(DEF_CFLAGS) -Wa,-mregnames -o $@ $<
 
-	$(CC) $(CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
+	$(CC) $(DEF_CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
 
 # Pseudo libc objects
 $(OBJDIR)/%.o: $(SRCDIR)/libc/src/%.c
 	@$(DEBUG) "CFLAGS  = $(CFLAGS)"
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CC) -c $(DEF_CFLAGS) -o $@ $<
 
 $(OBJDIR)/mem%.o: $(SRCDIR)/libc/src/mem.c
-	$(CC) $(CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
+	$(CC) $(DEF_CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
 
 $(OBJDIR)/rawmemchr.o: $(SRCDIR)/libc/src/mem.c
-	$(CC) $(CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
+	$(CC) $(DEF_CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
 
 $(OBJDIR)/str%.o: $(SRCDIR)/libc/src/str.c
 	@$(DEBUG) "CFLAGS  = $(CFLAGS)"
-	$(CC) $(CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
+	$(CC) $(DEF_CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
 
 $(OBJDIR)/stp%.o: $(SRCDIR)/libc/src/str.c
 	@$(DEBUG) "CFLAGS  = $(CFLAGS)"
-	$(CC) $(CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
+	$(CC) $(DEF_CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
 
 $(OBJDIR)/basename.o: $(SRCDIR)/libc/src/str.c
 	@$(DEBUG) "CFLAGS  = $(CFLAGS)"
-	$(CC) $(CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
+	$(CC) $(DEF_CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
 
 $(OBJDIR)/dirname.o: $(SRCDIR)/libc/src/str.c
 	@$(DEBUG) "CFLAGS  = $(CFLAGS)"
-	$(CC) $(CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
+	$(CC) $(DEF_CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
 
 $(OBJDIR)/%rintf.o: $(SRCDIR)/libc/src/format.c
 	@$(DEBUG) "CFLAGS  = $(CFLAGS)"
-	$(CC) $(CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
+	$(CC) $(DEF_CFLAGS) -D__USE_$(subst .o,,$(@F))__ -c -o $@ $<
 
 # libexec objects
 $(OBJDIR)/exec_%.o: $(SRCDIR)/libexec/%.c
 	@$(DEBUG) "CFLAGS  = $(CFLAGS)"
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CC) -c $(DEF_CFLAGS) -o $@ $<
 
 # libfs objects
 $(OBJDIR)/fs_%.o: $(SRCDIR)/libfs/%.c
 	@$(DEBUG) "CFLAGS  = $(CFLAGS)"
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CC) -c $(DEF_CFLAGS) -o $@ $<
 
 # libpart objects
 $(OBJDIR)/part_%.o: $(SRCDIR)/libpart/%.c
 	@$(DEBUG) "CFLAGS  = $(CFLAGS)"
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CC) -c $(DEF_CFLAGS) -o $@ $<
 
 # Devices drivers
 $(OBJDIR)/dev_%.o: $(SRCDIR)/dev/%.c
 	@$(DEBUG) "CFLAGS  = $(CFLAGS)"
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CC) -c $(DEF_CFLAGS) -o $@ $<
+
 # Char devices drivers
 $(OBJDIR)/dev_char_%.o: $(SRCDIR)/dev/char/%.c
 	@$(DEBUG) "CFLAGS  = $(CFLAGS)"
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CC) -c $(DEF_CFLAGS) -o $@ $<
+
 # Bloc devices drivers
 $(OBJDIR)/dev_bloc_%.o: $(SRCDIR)/dev/bloc/%.c
 	@$(DEBUG) "CFLAGS  = $(CFLAGS)"
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CC) -c $(DEF_CFLAGS) -o $@ $<
 
 # Other targets
 tarball: $(CURDIR)/Timestamp