diff options
| author | Pali Rohár <pali.rohar@gmail.com> | 2012-09-23 16:19:43 +0200 |
|---|---|---|
| committer | Pali Rohár <pali.rohar@gmail.com> | 2012-09-23 16:19:43 +0200 |
| commit | 08adc52c781ebdafc70520fd43da31856474ae2b (patch) | |
| tree | 37dceca24a82bf156b21bcdac53ad66b84e055cb | |
| parent | 95571860d0380f55a7c2d6ecd0fc5b8751fe18bb (diff) | |
| download | 0xFFFF-08adc52c781ebdafc70520fd43da31856474ae2b.tar.bz2 | |
Remove WITH_ defines
| -rw-r--r-- | config.mk | 4 | ||||
| -rw-r--r-- | src/Makefile | 14 | ||||
| -rw-r--r-- | src/console.c | 3 |
3 files changed, 1 insertions, 20 deletions
@@ -1,10 +1,6 @@ VERSION = 0.6 PREFIX = /usr/local -WITH_USB = 1 -#WITH_DEVICE = 1 -WITH_SQUEUES = 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 badddc1..706f185 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,19 +2,7 @@ include ../config.mk CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_GNU_SOURCE -I. CFLAGS += -W -Wall -Wno-unused-parameter -Wno-unused-result -O2 -pedantic -std=c99 -LIBS += -lm -ifdef WITH_USB -CPPFLAGS += -DWITH_USB -LIBS += -lusb -endif - -ifdef WITH_DEVICE -CPPFLAGS += -DWITH_DEVICE -endif - -ifdef WITH_SQUEUES -CPPFLAGS += -DWITH_SQUEUES -endif +LIBS += -lm -lusb 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 operations.o BIN = 0xFFFF diff --git a/src/console.c b/src/console.c index 011b371..46dfe9e 100644 --- a/src/console.c +++ b/src/console.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#if WITH_USB - #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -178,4 +176,3 @@ int console_prompt(void) return 0; } -#endif |