Added config.mk, correct DESTDIR/PREFIX usage

9 files changed, 58 insertions, 55 deletions

diff --git a/Makefile b/Makefile
index 435641e..1c56cfe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,32 @@
-CXX ?= clang
+include config.mk
 
 all:
 	$(MAKE) -C icebox
 	$(MAKE) -C icepack
 	$(MAKE) -C iceprog
 	$(MAKE) -C icemulti
+	# $(MAKE) -C icetime
 
 clean:
 	$(MAKE) -C icebox clean
 	$(MAKE) -C icepack clean
 	$(MAKE) -C iceprog clean
 	$(MAKE) -C icemulti clean
+	# $(MAKE) -C icetime clean
 
 install:
 	$(MAKE) -C icebox install
 	$(MAKE) -C icepack install
 	$(MAKE) -C iceprog install
 	$(MAKE) -C icemulti install
+	# $(MAKE) -C icetime install
 
 uninstall:
 	$(MAKE) -C icebox uninstall
 	$(MAKE) -C icepack uninstall
 	$(MAKE) -C iceprog uninstall
 	$(MAKE) -C icemulti uninstall
+	# $(MAKE) -C icetime uninstall
 
 .PHONY: all clean install uninstall
 
diff --git a/config.mk b/config.mk
new file mode 100644
index 0000000..b6c0f6a
--- /dev/null
+++ b/config.mk
@@ -0,0 +1,4 @@
+CXX = clang
+CC = $(CXX)
+DESTDIR =
+PREFIX = /usr/local
diff --git a/icebox/Makefile b/icebox/Makefile
index 72c98b9..43d4664 100644
--- a/icebox/Makefile
+++ b/icebox/Makefile
@@ -1,4 +1,4 @@
-DESTDIR = /usr/local
+include ../config.mk
 
 all: chipdb-1k.txt chipdb-8k.txt
 
@@ -15,33 +15,33 @@ clean:
 	rm -f icebox.pyc iceboxdb.pyc
 
 install: all
-	mkdir -p $(DESTDIR)/share/icebox
-	mkdir -p $(DESTDIR)/bin
-	cp chipdb-1k.txt     $(DESTDIR)/share/icebox/
-	cp chipdb-8k.txt     $(DESTDIR)/share/icebox/
-	cp icebox.py         $(DESTDIR)/bin/icebox.py
-	cp iceboxdb.py       $(DESTDIR)/bin/iceboxdb.py
-	cp icebox_chipdb.py  $(DESTDIR)/bin/icebox_chipdb
-	cp icebox_diff.py    $(DESTDIR)/bin/icebox_diff
-	cp icebox_explain.py $(DESTDIR)/bin/icebox_explain
-	cp icebox_colbuf.py  $(DESTDIR)/bin/icebox_colbuf
-	cp icebox_html.py    $(DESTDIR)/bin/icebox_html
-	cp icebox_maps.py    $(DESTDIR)/bin/icebox_maps
-	cp icebox_vlog.py    $(DESTDIR)/bin/icebox_vlog
+	mkdir -p $(DESTDIR)$(PREFIX)/share/icebox
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	cp chipdb-1k.txt     $(DESTDIR)$(PREFIX)/share/icebox/
+	cp chipdb-8k.txt     $(DESTDIR)$(PREFIX)/share/icebox/
+	cp icebox.py         $(DESTDIR)$(PREFIX)/bin/icebox.py
+	cp iceboxdb.py       $(DESTDIR)$(PREFIX)/bin/iceboxdb.py
+	cp icebox_chipdb.py  $(DESTDIR)$(PREFIX)/bin/icebox_chipdb
+	cp icebox_diff.py    $(DESTDIR)$(PREFIX)/bin/icebox_diff
+	cp icebox_explain.py $(DESTDIR)$(PREFIX)/bin/icebox_explain
+	cp icebox_colbuf.py  $(DESTDIR)$(PREFIX)/bin/icebox_colbuf
+	cp icebox_html.py    $(DESTDIR)$(PREFIX)/bin/icebox_html
+	cp icebox_maps.py    $(DESTDIR)$(PREFIX)/bin/icebox_maps
+	cp icebox_vlog.py    $(DESTDIR)$(PREFIX)/bin/icebox_vlog
 
 uninstall:
-	rm -f $(DESTDIR)/bin/icebox.py
-	rm -f $(DESTDIR)/bin/iceboxdb.py
-	rm -f $(DESTDIR)/bin/icebox_chipdb
-	rm -f $(DESTDIR)/bin/icebox_diff
-	rm -f $(DESTDIR)/bin/icebox_explain
-	rm -f $(DESTDIR)/bin/icebox_colbuf
-	rm -f $(DESTDIR)/bin/icebox_html
-	rm -f $(DESTDIR)/bin/icebox_maps
-	rm -f $(DESTDIR)/bin/icebox_vlog
-	rm -f $(DESTDIR)/share/icebox/chipdb-1k.txt
-	rm -f $(DESTDIR)/share/icebox/chipdb-8k.txt
-	-rmdir $(DESTDIR)/share/icebox
+	rm -f $(DESTDIR)$(PREFIX)/bin/icebox.py
+	rm -f $(DESTDIR)$(PREFIX)/bin/iceboxdb.py
+	rm -f $(DESTDIR)$(PREFIX)/bin/icebox_chipdb
+	rm -f $(DESTDIR)$(PREFIX)/bin/icebox_diff
+	rm -f $(DESTDIR)$(PREFIX)/bin/icebox_explain
+	rm -f $(DESTDIR)$(PREFIX)/bin/icebox_colbuf
+	rm -f $(DESTDIR)$(PREFIX)/bin/icebox_html
+	rm -f $(DESTDIR)$(PREFIX)/bin/icebox_maps
+	rm -f $(DESTDIR)$(PREFIX)/bin/icebox_vlog
+	rm -f $(DESTDIR)$(PREFIX)/share/icebox/chipdb-1k.txt
+	rm -f $(DESTDIR)$(PREFIX)/share/icebox/chipdb-8k.txt
+	-rmdir $(DESTDIR)$(PREFIX)/share/icebox
 
 .PHONY: all clean install uninstall
 
diff --git a/icefuzz/Makefile b/icefuzz/Makefile
index 0233eb4..702bbea 100644
--- a/icefuzz/Makefile
+++ b/icefuzz/Makefile
@@ -1,4 +1,4 @@
-
+include ../config.mk
 export LC_ALL=C
 
 TESTS =
diff --git a/icemulti/Makefile b/icemulti/Makefile
index f195e61..387549d 100644
--- a/icemulti/Makefile
+++ b/icemulti/Makefile
@@ -1,19 +1,17 @@
-# CXX = clang
-CXX ?= clang
+include ../config.mk
 LDLIBS = -lm -lstdc++
 CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11
-CC = $(CXX)
-DESTDIR = /usr/local
 
 all: icemulti
 
 icemulti: icemulti.o
 
 install: all
-	cp icemulti $(DESTDIR)/bin/icemulti
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	cp icemulti $(DESTDIR)$(PREFIX)/bin/icemulti
 
 uninstall:
-	rm -f $(DESTDIR)/bin/icemulti
+	rm -f $(DESTDIR)$(PREFIX)/bin/icemulti
 
 clean:
 	rm -f icemulti
diff --git a/icepack/Makefile b/icepack/Makefile
index a89aa1f..256c339 100644
--- a/icepack/Makefile
+++ b/icepack/Makefile
@@ -1,10 +1,7 @@
-# CXX = clang
-CXX ?= clang
+include ../config.mk
 LDLIBS = -lm -lstdc++
 CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include
 MXEGCC = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc
-CC = $(CXX)
-DESTDIR = /usr/local
 
 all: icepack iceunpack
 
@@ -17,12 +14,13 @@ iceunpack: icepack
 	ln -sf icepack iceunpack
 
 install: all
-	cp icepack $(DESTDIR)/bin/icepack
-	ln -sf icepack $(DESTDIR)/bin/iceunpack
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	cp icepack $(DESTDIR)$(PREFIX)/bin/icepack
+	ln -sf icepack $(DESTDIR)$(PREFIX)/bin/iceunpack
 
 uninstall:
-	rm -f $(DESTDIR)/bin/icepack
-	rm -f $(DESTDIR)/bin/iceunpack
+	rm -f $(DESTDIR)$(PREFIX)/bin/icepack
+	rm -f $(DESTDIR)$(PREFIX)/bin/iceunpack
 
 clean:
 	rm -f icepack
diff --git a/iceprog/Makefile b/iceprog/Makefile
index 578a3e3..4ffb9a5 100644
--- a/iceprog/Makefile
+++ b/iceprog/Makefile
@@ -1,8 +1,7 @@
-# CC = clang
+include ../config.mk
 LDLIBS = -L/usr/local/lib -lftdi -lm
 CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
 MXEGCC = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc
-DESTDIR = /usr/local
 
 all: iceprog
 
@@ -12,10 +11,11 @@ iceprog.exe: iceprog.c
 	$(MXEGCC) -std=c99 -o iceprog.exe -Os iceprog.c -lftdi -lusb -lm
 
 install: all
-	cp iceprog $(DESTDIR)/bin/iceprog
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	cp iceprog $(DESTDIR)$(PREFIX)/bin/iceprog
 
 uninstall:
-	rm -f $(DESTDIR)/bin/iceprog
+	rm -f $(DESTDIR)$(PREFIX)/bin/iceprog
 
 clean:
 	rm -f iceprog
diff --git a/iceprog/iceprog.c b/iceprog/iceprog.c
index d5419bd..26f893f 100644
--- a/iceprog/iceprog.c
+++ b/iceprog/iceprog.c
@@ -202,7 +202,7 @@ void flash_64kB_sector_erase(int addr)
 {
 	fprintf(stderr, "erase 64kB sector at 0x%06X..\n", addr);
 
-	uint8_t command[4] = { 0xd8, addr >> 16, addr >> 8, addr };
+	uint8_t command[4] = { 0xd8, (uint8_t)(addr >> 16), (uint8_t)(addr >> 8), (uint8_t)addr };
 	set_gpio(0, 0);
 	send_spi(command, 4);
 	set_gpio(1, 0);
@@ -213,7 +213,7 @@ void flash_prog(int addr, uint8_t *data, int n)
 	if (verbose)
 		fprintf(stderr, "prog 0x%06X +0x%03X..\n", addr, n);
 
-	uint8_t command[4] = { 0x02, addr >> 16, addr >> 8, addr };
+	uint8_t command[4] = { 0x02, (uint8_t)(addr >> 16), (uint8_t)(addr >> 8), (uint8_t)addr };
 	set_gpio(0, 0);
 	send_spi(command, 4);
 	send_spi(data, n);
@@ -229,7 +229,7 @@ void flash_read(int addr, uint8_t *data, int n)
 	if (verbose)
 		fprintf(stderr, "read 0x%06X +0x%03X..\n", addr, n);
 
-	uint8_t command[4] = { 0x03, addr >> 16, addr >> 8, addr };
+	uint8_t command[4] = { 0x03, (uint8_t)(addr >> 16), (uint8_t)(addr >> 8), (uint8_t)addr };
 	set_gpio(0, 0);
 	send_spi(command, 4);
 	memset(data, 0, n);
@@ -338,7 +338,7 @@ int main(int argc, char **argv)
 	bool test_mode = false;
 	const char *filename = NULL;
 	const char *devstr = NULL;
-	int ifnum = INTERFACE_A;
+	enum ftdi_interface ifnum = INTERFACE_A;
 
 	int opt;
 	while ((opt = getopt(argc, argv, "d:I:rRcbnStv")) != -1)
diff --git a/icetime/Makefile b/icetime/Makefile
index c7f0c14..c98f40b 100644
--- a/icetime/Makefile
+++ b/icetime/Makefile
@@ -1,18 +1,17 @@
-# CXX = clang
+include ../config.mk
 LDLIBS = -lm -lstdc++
 CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include
-CC = $(CXX)
-DESTDIR = /usr/local
 
 all: icetime
 
 icetime: icetime.o
 
 install: all
-	cp icetime $(DESTDIR)/bin/icetime
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	cp icetime $(DESTDIR)$(PREFIX)/bin/icetime
 
 uninstall:
-	rm -f $(DESTDIR)/bin/icetime
+	rm -f $(DESTDIR)$(PREFIX)/bin/icetime
 
 
 # View timing netlist: