Author: stepan Date: 2009-11-29 14:49:47 +0100 (Sun, 29 Nov 2009) New Revision: 636
Modified: trunk/fcode-utils-devel/Makefile trunk/fcode-utils-devel/detok/Makefile trunk/fcode-utils-devel/romheaders/Makefile trunk/fcode-utils-devel/toke/Makefile Log: slightly rework fcode-utils makefiles: - honor $(MAKE) for those invoking with gmake instead of make - wipe overzealous make distclean - drop -s from strip arguments
Signed-off-by: Stefan Reinauer stepan@coresystems.de
Modified: trunk/fcode-utils-devel/Makefile =================================================================== --- trunk/fcode-utils-devel/Makefile 2009-11-26 01:47:36 UTC (rev 635) +++ trunk/fcode-utils-devel/Makefile 2009-11-29 13:49:47 UTC (rev 636) @@ -5,7 +5,7 @@ # This program is part of a free implementation of the IEEE 1275-1994 # Standard for Boot (Initialization Configuration) Firmware. # -# Copyright (C) 2006 coresystems GmbH info@coresystems.de +# Copyright (C) 2006-2009 coresystems GmbH info@coresystems.de # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,26 +24,26 @@ VERSION:=$(shell grep ^#.*TOKE_VERSION < toke/toke.c |cut -f2 -d" )
all: - make -C toke - make -C detok - make -C romheaders + $(MAKE) -C toke + $(MAKE) -C detok + $(MAKE) -C romheaders
install: - make -C toke install - make -C detok install - make -C romheaders install + $(MAKE) -C toke install + $(MAKE) -C detok install + $(MAKE) -C romheaders install
clean: - make -C toke clean - make -C detok clean - make -C romheaders clean - make -C testsuite clean + $(MAKE) -C toke clean + $(MAKE) -C detok clean + $(MAKE) -C romheaders clean + $(MAKE) -C testsuite clean
distclean: clean - make -C toke distclean - make -C detok distclean - make -C romheaders distclean - make -C testsuite distclean + $(MAKE) -C toke distclean + $(MAKE) -C detok distclean + $(MAKE) -C romheaders distclean + $(MAKE) -C testsuite distclean find . -name "*.gcda" -exec rm -f {} ; find . -name "*.gcno" -exec rm -f {} ;
@@ -51,8 +51,8 @@ cp toke/toke testsuite cp detok/detok testsuite cp romheaders/romheaders testsuite - make -C testsuite all CygTestLogs=`pwd`/testlogs/testlogs-ppc-linux - #make -C testsuite all CygTestLogs=`pwd`/testlogs/testlogs-x86-cygwin + $(MAKE) -C testsuite all CygTestLogs=`pwd`/testlogs/testlogs-ppc-linux + #$(MAKE) -C testsuite all CygTestLogs=`pwd`/testlogs/testlogs-x86-cygwin
# lcov required for html reports coverage:
Modified: trunk/fcode-utils-devel/detok/Makefile =================================================================== --- trunk/fcode-utils-devel/detok/Makefile 2009-11-26 01:47:36 UTC (rev 635) +++ trunk/fcode-utils-devel/detok/Makefile 2009-11-29 13:49:47 UTC (rev 636) @@ -6,7 +6,7 @@ # Standard for Boot (Initialization Configuration) Firmware. # # Copyright (C) 2001-2006 Stefan Reinauer stepan@openbios.org -# Copyright (C) 2006 coresystems GmbH info@coresystems.de +# Copyright (C) 2006-2009 coresystems GmbH info@coresystems.de # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@
PROGRAM = detok
-CC = gcc +CC ?= gcc STRIP = strip INCLUDES = -I../shared
# Normal Flags: -CFLAGS = -O2 -Wall -Wno-pointer-sign +CFLAGS = -O2 -Wall -Wextra LDFLAGS =
# Coverage: @@ -47,12 +47,10 @@
$(PROGRAM): $(OBJS) $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS) - $(STRIP) -s $(PROGRAM) + $(STRIP) $(PROGRAM)
clean: rm -f $(OBJS) *~ - -distclean: clean rm -f $(PROGRAM) .dependencies .dependencies: *.c
Modified: trunk/fcode-utils-devel/romheaders/Makefile =================================================================== --- trunk/fcode-utils-devel/romheaders/Makefile 2009-11-26 01:47:36 UTC (rev 635) +++ trunk/fcode-utils-devel/romheaders/Makefile 2009-11-29 13:49:47 UTC (rev 636) @@ -5,7 +5,8 @@ # This program is part of a free implementation of the IEEE 1275-1994 # Standard for Boot (Initialization Configuration) Firmware. # -# Copyright (C) 2002 Stefan Reinauer, stepan@openbios.net +# Copyright (C) 2002 Stefan Reinauer, stepan@openbios.org +# Copyright (C) 2009 coresystems GmbH info@coresystems.de # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,8 +22,9 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA #
-CC = gcc -CFLAGS= -O2 -Wall -W -ansi -I../shared +CC ?= gcc +STRIP = strip +CFLAGS = -O2 -Wall -W -ansi -I../shared
SOURCES = romheaders.c ../shared/classcodes.c
@@ -32,10 +34,9 @@
romheaders: $(SOURCES) $(CC) $(CFLAGS) $(SOURCES) -o $@ - strip romheaders + $(STRIP) romheaders clean: rm -f *~ + rm -f romheaders
-distclean: clean - rm -f romheaders
Modified: trunk/fcode-utils-devel/toke/Makefile =================================================================== --- trunk/fcode-utils-devel/toke/Makefile 2009-11-26 01:47:36 UTC (rev 635) +++ trunk/fcode-utils-devel/toke/Makefile 2009-11-29 13:49:47 UTC (rev 636) @@ -6,7 +6,7 @@ # Standard for Boot (Initialization Configuration) Firmware. # # Copyright (C) 2001-2006 Stefan Reinauer stepan@openbios.org -# Copyright (C) 2006 coresystems GmbH info@coresystems.de +# Copyright (C) 2006-2009 coresystems GmbH info@coresystems.de # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@
PROGRAM = toke
-CC = gcc +CC ?= gcc STRIP = strip INCLUDES = -I../shared
# Normal flags -CFLAGS = -O2 -Wall -Wno-pointer-sign -fno-strict-aliasing +CFLAGS = -O2 -Wall -Wextra LDFLAGS =
# Coverage: @@ -48,14 +48,12 @@
$(PROGRAM): $(OBJS) $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS) - $(STRIP) -s $(PROGRAM) + $(STRIP) $(PROGRAM)
clean: rm -f $(OBJS) *~ - -distclean: clean rm -f $(PROGRAM) .dependencies - + .dependencies: *.c @$(CC) $(CFLAGS) $(INCLUDES) -MM *.c > .dependencies