Merge tag 'v0.4' into debian

[kinect-audio-setup.git] / kinect_upload_fw / Makefile

diff --git a/kinect_upload_fw/Makefile b/kinect_upload_fw/Makefile
index e917d59..c8bbc86 100644 (file)
--- a/kinect_upload_fw/Makefile
+++ b/kinect_upload_fw/Makefile
@@ -1,4 +1,12 @@
-CFLAGS ?= -std=c99 -pedantic -pedantic-errors -Wall -Wextra -O2
+CFLAGS ?= -std=c99 -pedantic -Wall -Wextra -O2
+
+# Don't make pedantic checks errors,
+# as vanilla libusb-1.0.8 can't live with that
+#CFLAGS += -pedantic-errors
+
+# GCC >= 4.6
+#CFLAGS += -Wunused-but-set-variable
+

 CFLAGS += -fno-common \
   -Wall \
   -Wextra \
 CFLAGS += -fno-common \
   -Wall \
   -Wextra \


@@ -22,12 +30,14 @@ CFLAGS += -fno-common \
   -Wswitch-enum \
   -Wundef \
   -Wunreachable-code \
   -Wswitch-enum \
   -Wundef \
   -Wunreachable-code \

-  -Wunsafe-loop-optimizations \
-  -Wunused-but-set-variable \

   -Wwrite-strings
 
   -Wwrite-strings
 

-CFLAGS  += $(shell pkg-config --cflags libusb-1.0)
-LDFLAGS += $(shell pkg-config --libs libusb-1.0)
+ifneq ($(CC),clang)
+  CFLAGS += -Wunsafe-loop-optimizations
+endif
+
+CFLAGS += $(shell pkg-config --cflags libusb-1.0)
+LDLIBS += $(shell pkg-config --libs libusb-1.0)

 
 PREFIX ?= /usr/local
 bindir := $(PREFIX)/sbin
 
 PREFIX ?= /usr/local
 bindir := $(PREFIX)/sbin


@@ -41,7 +51,9 @@ endian.h: endian
        rm -f endian.h
        ./endian > endian.h
 
        rm -f endian.h
        ./endian > endian.h
 

-kinect_upload_fw: endian.h kinect_upload_fw.o
+kinect_upload_fw.o: endian.h
+
+kinect_upload_fw: kinect_upload_fw.o

 
 
 install: kinect_upload_fw
 
 
 install: kinect_upload_fw