diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2010-06-14 12:42:05 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2010-06-14 12:42:05 +0000 |
| commit | 5bdf2984392a9089e44bc0b7c63582a1cded6832 (patch) | |
| tree | 7ec857379d58ae9df3aaf36ae73f154030207514 | |
| parent | 89bed6d83606c26445b088f48338737740e310b7 (diff) | |
| download | flashrom-5bdf2984392a9089e44bc0b7c63582a1cded6832.tar.gz flashrom-5bdf2984392a9089e44bc0b7c63582a1cded6832.tar.bz2 flashrom-5bdf2984392a9089e44bc0b7c63582a1cded6832.zip | |
We already have NEED_PCI in the Makefile to link in PCI support
Add NEED_SERIAL and NEED_NET to decouple individual drivers from
compilation and linking decisions. Move libgetopt from a DOS+PCI
dependency to a DOS dependency to fix linking on DOS if no driver
requiring PCI is enabled.
Corresponding to flashrom svn r1044.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
| -rw-r--r-- | Makefile | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -50,6 +50,8 @@ LDFLAGS += -L/usr/local/lib endif ifeq ($(OS_ARCH), DOS) CPPFLAGS += -I../libgetopt -I../libpci/include +# FIXME Check if we can achieve the same effect with -L../libgetopt -lgetopt +LIBS += ../libgetopt/libgetopt.a # Bus Pirate and Serprog are not supported under DOS. CONFIG_BUSPIRATE_SPI = no CONFIG_SERPROG = no @@ -136,9 +138,8 @@ endif ifeq ($(CONFIG_SERPROG), yes) FEATURE_CFLAGS += -D'CONFIG_SERPROG=1' PROGRAMMER_OBJS += serprog.o -ifeq ($(OS_ARCH), SunOS) -LIBS += -lsocket -endif +NEED_SERIAL := yes +NEED_NET := yes endif ifeq ($(CONFIG_BITBANG_SPI), yes) @@ -204,6 +205,7 @@ endif ifeq ($(CONFIG_BUSPIRATE_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_BUSPIRATE_SPI=1' PROGRAMMER_OBJS += buspirate_spi.o +NEED_SERIAL := yes endif ifeq ($(CONFIG_DEDIPROG), yes) @@ -212,20 +214,18 @@ FEATURE_LIBS += -lusb PROGRAMMER_OBJS += dediprog.o endif -# Ugly, but there's no elif/elseif. -ifeq ($(CONFIG_SERPROG), yes) -LIB_OBJS += serial.o -else -ifeq ($(CONFIG_BUSPIRATE_SPI), yes) +ifeq ($(NEED_SERIAL), yes) LIB_OBJS += serial.o endif -endif -ifeq ($(NEED_PCI), yes) -CHECK_LIBPCI = yes +ifeq ($(NEED_NET), yes) +ifeq ($(OS_ARCH), SunOS) +LIBS += -lsocket +endif endif ifeq ($(NEED_PCI), yes) +CHECK_LIBPCI = yes FEATURE_CFLAGS += -D'NEED_PCI=1' PROGRAMMER_OBJS += pcidev.o physmap.o hwaccess.o ifeq ($(OS_ARCH), NetBSD) @@ -236,7 +236,7 @@ LIBS += -l$(shell uname -p) else ifeq ($(OS_ARCH), DOS) # FIXME There needs to be a better way to do this -LIBS += ../libpci/lib/libpci.a ../libgetopt/libgetopt.a +LIBS += ../libpci/lib/libpci.a else LIBS += -lpci endif |