Remove WITH_ defines

config.mk

@@ -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

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

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