From 83bcb7358c6475468db639cd47ef6e4f4e9dbee3 Mon Sep 17 00:00:00 2001 From: Pali Rohár Date: Sat, 11 Aug 2012 11:12:58 +0200 Subject: Rewrite Makefile, move WITH_DEVICE, WITH_USB and WITH_SQUEUES to Makefile --- config.mk | 15 ++++++++------- src/Makefile | 43 +++++++++++++++++++++---------------------- src/cold-flash.c | 3 ++- src/console.c | 4 +++- src/device.c | 2 ++ src/dump.c | 2 ++ src/fiasco.c | 1 + src/main.c | 7 +------ src/printf-utils.c | 2 ++ src/qmode.c | 8 ++------ src/usb-device.c | 1 - 11 files changed, 44 insertions(+), 44 deletions(-) diff --git a/config.mk b/config.mk index 80b1284..e63777e 100644 --- a/config.mk +++ b/config.mk @@ -1,9 +1,10 @@ -VERSION=0.5 -PREFIX=/usr/local +VERSION = 0.6 +PREFIX = /usr/local -# NetBSD stuff -CFLAGS+=-I/usr/pkg/include -g -O2 -LDFLAGS+=-L/usr/pkg/lib -Wl,-R/usr/pkg/lib +WITH_USB = 1 +#WITH_DEVICE = 1 +WITH_SQUEUES = 1 -HAVE_USB=1 -HAVE_GUI=1 +# NetBSD stuff +#CFLAGS += -I/usr/pkg/include -g -O2 +#LDFLAGS += -L/usr/pkg/lib -Wl,-R/usr/pkg/lib diff --git a/src/Makefile b/src/Makefile index 17c3198..9f1b511 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,31 +1,30 @@ include ../config.mk -OBJ=main.o dump.o nolo.o qmode.o -OBJ+=printf-utils.o console.o -OBJ+=squeue/squeue.o -OBJ+=image.o fiasco.o device.o usb-device.o cold-flash.o -BIN=0xFFFF -#LIBS=`${HAVE_USB} && echo -- '-lusb'` -LIBS=`if [ "${HAVE_USB}" = 1 ]; then echo '-lusb'; fi` -CFLAGS+=-DVERSION=\"${VERSION}\" -Wall -I . -CFLAGS+=-pedantic -std=c99 -DHAVE_USB=${HAVE_USB} -Wno-unused-result -USBOBJ=../libusb/error.o ../libusb/usb.o ../libusb/descriptors.o -USBOBJ+=../libusb/linux.o ## XXX not portable -CFLAGS+=-I../libusb -LDFLAGS+=-L../libusb +CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_GNU_SOURCE +CFLAGS += -DVERSION=\"$(VERSION)\" -W -Wall -Wno-unused-parameter -Wno-unused-result -O2 -pedantic -std=c99 -I. +ifdef WITH_USB +CPPFLAGS += -DWITH_USB +LIBS += -lusb +endif -CFLAGS+=-D_GNU_SOURCE +ifdef WITH_DEVICE +CPPFLAGS += -DWITH_DEVICE +endif -all: ${BIN} +ifdef WITH_SQUEUES +CPPFLAGS += -DWITH_SQUEUES +endif -${BIN}: ${OBJ} - ${CC} ${LDFLAGS} -o ${BIN} ${OBJ} ${LIBS} +OBJS = main.o nolo.o printf-utils.o image.o fiasco.o device.o usb-device.o cold-flash.o dump.o qmode.o console.o squeue/squeue.o +BIN = 0xFFFF -allusb: ${OBJ} - ${CC} ${LDFLAGS} -o ${BIN} ${OBJ} ${USBOBJ} +all: $(BIN) -static: ${OBJ} - ${CC} ${LDFLAGS} -o ${BIN} -static ${OBJ} ${USBOBJ} +$(BIN): $(OBJS) Makefile ../config.mk + $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJS) $(LIBS) + +%.o: %.c Makefile ../config.mk + $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< clean: - -rm -f ${OBJ} ${BIN} + -rm -f $(OBJS) $(BIN) diff --git a/src/cold-flash.c b/src/cold-flash.c index 4a691ad..ac68cfa 100644 --- a/src/cold-flash.c +++ b/src/cold-flash.c @@ -23,11 +23,12 @@ #include #include +#include "global.h" + #include "cold-flash.h" #include "image.h" #include "usb-device.h" #include "printf-utils.h" -#include "global.h" #define READ_DEV 0x81 #define WRITE_DEV 0x01 diff --git a/src/console.c b/src/console.c index 1b1d723..011b371 100644 --- a/src/console.c +++ b/src/console.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#if HAVE_USB +#if WITH_USB #include #include @@ -25,6 +25,8 @@ #include #include +#include + #include "console.h" #include "nolo.h" #include "dump.h" diff --git a/src/device.c b/src/device.c index 478d017..8e652b6 100644 --- a/src/device.c +++ b/src/device.c @@ -21,6 +21,8 @@ #include #include +#include "global.h" + #include "device.h" static const char * devices[] = { diff --git a/src/dump.c b/src/dump.c index 894a6d2..7c3657f 100644 --- a/src/dump.c +++ b/src/dump.c @@ -21,6 +21,8 @@ #include #include +#include "global.h" + #include "dump.h" #include "printf-utils.h" diff --git a/src/fiasco.c b/src/fiasco.c index 6cc3e12..1a0c53d 100644 --- a/src/fiasco.c +++ b/src/fiasco.c @@ -29,6 +29,7 @@ #include #include "global.h" + #include "device.h" #include "image.h" #include "fiasco.h" diff --git a/src/main.c b/src/main.c index 32d0247..b98cf6e 100644 --- a/src/main.c +++ b/src/main.c @@ -29,6 +29,7 @@ #include #include "global.h" + #include "image.h" #include "fiasco.h" #include "device.h" @@ -38,16 +39,10 @@ #include "qmode.h" #include "nolo.h" -#undef VERSION -#define VERSION "0.6" - static void show_title(void) { printf("0xFFFF v%s // The Free Fiasco Firmware Flasher\n", VERSION); } -#define WITH_USB -//#define WITH_DEVICE - static void show_usage(void) { int i; diff --git a/src/printf-utils.c b/src/printf-utils.c index 7eacb0a..3ea0135 100644 --- a/src/printf-utils.c +++ b/src/printf-utils.c @@ -22,6 +22,8 @@ #include #include +#include "global.h" + #include "printf-utils.h" int printf_prev = 0; diff --git a/src/qmode.c b/src/qmode.c index e83fe66..4ae1128 100644 --- a/src/qmode.c +++ b/src/qmode.c @@ -27,15 +27,11 @@ #include #include +#include "global.h" + #include "qmode.h" #include "nolo.h" -#if __linux__ || __NetBSD__ || __FreBSD__ || __OpenBSD__ || __Darwin__ || __MacOSX__ -#define HAVE_SQUEUE 1 -#else -#define HAVE_SQUEUE 0 -#endif - #if HAVE_SQUEUE #include "squeue/squeue.h" diff --git a/src/usb-device.c b/src/usb-device.c index 103c729..160b36e 100644 --- a/src/usb-device.c +++ b/src/usb-device.c @@ -37,7 +37,6 @@ static struct usb_flash_device usb_devices[] = { { 0x0421, 0x01c8, 1, 1, -1, FLASH_MKII, { DEVICE_RX_51, 0 } }, { 0x0421, 0x0431, 0, -1, -1, FLASH_DISK, { DEVICE_SU_18, DEVICE_RX_34, 0 } }, { 0x0421, 0x3f00, 2, 1, -1, FLASH_NOLO, { DEVICE_RX_34, 0 } }, - { 0, } }; static const char * usb_flash_protocols[] = { -- cgit v1.2.3