Hey guys, I wrote a patch which includes some Makefile improvements so please review.
Signed-off-by: Christian Ruppert <[email protected]> Regards, Christian
Index: Makefile
===================================================================
--- Makefile (revision 483)
+++ Makefile (working copy)
@@ -8,12 +8,16 @@
CC ?= gcc
STRIP = strip
-INSTALL = /usr/bin/install
-PREFIX = /usr/local
+INSTALL = install
+PREFIX ?= /usr/local
+DESTDIR =
#CFLAGS = -O2 -g -Wall -Werror
-CFLAGS = -Os -Wall -Werror
-LDFLAGS =
+CFLAGS ?= -Os -Wall -Werror
+prefix = $(DESTDIR)$(PREFIX)
+man8dir = $(prefix)/share/man/man8
+sbindir = $(prefix)/sbin
+
OS_ARCH = $(shell uname)
ifneq ($(OS_ARCH), SunOS)
STRIP_ARGS = -s
@@ -27,7 +31,7 @@
LDFLAGS += -L/usr/local/lib
endif
-LDFLAGS += -lpci -lz
+LIBS += -lpci
OBJS = chipset_enable.o board_enable.o udelay.o jedec.o stm50flw0x0x.o \
sst28sf040.o am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o \
@@ -45,11 +49,11 @@
| sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"'
$(PROGRAM): $(OBJS)
- $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
+ $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
$(STRIP) $(STRIP_ARGS) $(PROGRAM)
flashrom.o: flashrom.c
- $(CC) -c $(CFLAGS) $(SVNDEF) $(CPPFLAGS) $< -o $@
+ $(CC) -c $(CFLAGS) $(SVNDEF) $< -o $@
clean:
rm -f $(PROGRAM) *.o
@@ -58,25 +62,26 @@
rm -f .dependencies
dep:
- @$(CC) $(SVNDEF) -MM *.c > .dependencies
+ @$(CC) $(CFLAGS) $(SVNDEF) -MM *.c > .dependencies
pciutils:
- @echo; printf "Checking for pciutils and zlib... "
+ @echo; printf "Checking for pciutils... "
@$(shell ( echo "#include <pci/pci.h>"; \
echo "struct pci_access *pacc;"; \
echo "int main(int argc, char **argv)"; \
echo "{ pacc = pci_alloc(); return 0; }"; ) > .test.c )
- @$(CC) $(CFLAGS) .test.c -o .test $(LDFLAGS) >/dev/null 2>&1 && \
+ @$(CC) $(CFLAGS) $(LDFLAGS) .test.c -o .test $(LIBS) >/dev/null 2>&1 && \
echo "found." || ( echo "not found."; echo; \
- echo "Please install pciutils-devel and zlib-devel."; \
+ echo "Please install pciutils-devel."; \
echo "See README for more information."; echo; \
rm -f .test.c .test; exit 1)
@rm -f .test.c .test
install: $(PROGRAM)
- $(INSTALL) $(PROGRAM) $(PREFIX)/sbin
- mkdir -p $(PREFIX)/share/man/man8
- $(INSTALL) $(PROGRAM).8 $(PREFIX)/share/man/man8
+ $(INSTALL) -d $(sbindir)
+ $(INSTALL) -d $(man8dir)
+ $(INSTALL) -m 0755 $(PROGRAM) $(sbindir)
+ $(INSTALL) -m 0644 $(PROGRAM).8 $(man8dir)
.PHONY: all clean distclean dep pciutils
signature.asc
Description: This is a digitally signed message part.
-- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
