Fix manual Makefiles and add CI for them (libusb#131)

broken-bytes · Jan 12, 2020 · 51bdec7 · 51bdec7
1 parent 65d22a9
commit 51bdec7
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 44 deletions.
diff --git a/.builds/alpine.yml b/.builds/alpine.yml
@@ -17,3 +17,9 @@ tasks:
     cd hidapi
     make
     make DESTDIR=$PWD/root install
+    make clean
+- build-manual: |
+    cd hidapi/linux
+    make -f Makefile-manual
+    cd ../libusb
+    make -f Makefile-manual
diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml
@@ -10,3 +10,9 @@ tasks:
     cd hidapi
     make
     make DESTDIR=$PWD/root install
+    make clean
+- build-manual: |
+    cd hidapi/linux
+    make -f Makefile-manual
+    cd ../libusb
+    make -f Makefile-manual
diff --git a/.builds/fedora-mingw.yml b/.builds/fedora-mingw.yml
@@ -16,3 +16,7 @@ tasks:
     cd hidapi
     make
     make DESTDIR=$PWD/root install
+    make clean
+- build-manual: |
+    cd hidapi/windows
+    make -f Makefile-manual OS=MINGW CC=x86_64-w64-mingw32-gcc
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
@@ -2,6 +2,7 @@ image: freebsd/latest
 packages:
 - autoconf
 - automake
+- gmake
 - libiconv
 - libtool
 - pkgconf
@@ -16,3 +17,7 @@ tasks:
     cd hidapi
     make
     make DESTDIR=$PWD/root install
+    make clean
+- build-manual: |
+    cd hidapi/libusb
+    gmake -f Makefile-manual
diff --git a/.travis.yml b/.travis.yml
@@ -8,3 +8,6 @@ script:
   - ./configure
   - make
   - make DESTDIR=$PWD/root install
+  - make clean
+  - cd mac
+  - make -f Makefile-manual
diff --git a/libusb/Makefile.freebsd b/libusb/Makefile.freebsd
@@ -13,20 +13,16 @@ libs: libhidapi.so
 CC       ?= cc
 CFLAGS   ?= -Wall -g -fPIC
 
-CXX      ?= c++
-CXXFLAGS ?= -Wall -g
-
-COBJS     = hid.o
-CPPOBJS   = ../hidtest/hidtest.o
-OBJS      = $(COBJS) $(CPPOBJS)
+COBJS     = hid.o ../hidtest/test.o
+OBJS      = $(COBJS)
 INCLUDES  = -I../hidapi -I/usr/local/include
 LDFLAGS   = -L/usr/local/lib
 LIBS      = -lusb -liconv -pthread
 
 
 # Console Test Program
 hidtest: $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
 
 # Shared Libs
 libhidapi.so: $(COBJS)
@@ -36,9 +32,6 @@ libhidapi.so: $(COBJS)
 $(COBJS): %.o: %.c
 	$(CC) $(CFLAGS) -c $(INCLUDES) $< -o $@
 
-$(CPPOBJS): %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $(INCLUDES) $< -o $@
-
 
 clean:
 	rm -f $(OBJS) hidtest libhidapi.so ../hidtest/hidtest.o

diff --git a/libusb/Makefile.linux b/libusb/Makefile.linux
@@ -13,23 +13,19 @@ libs: libhidapi-libusb.so
 CC       ?= gcc
 CFLAGS   ?= -Wall -g -fpic
 
-CXX      ?= g++
-CXXFLAGS ?= -Wall -g -fpic
-
 LDFLAGS  ?= -Wall -g
 
 COBJS_LIBUSB = hid.o
-COBJS = $(COBJS_LIBUSB)
-CPPOBJS   = ../hidtest/hidtest.o
-OBJS      = $(COBJS) $(CPPOBJS)
+COBJS = $(COBJS_LIBUSB) ../hidtest/test.o
+OBJS      = $(COBJS)
 LIBS_USB  = `pkg-config libusb-1.0 --libs` -lrt -lpthread
 LIBS      = $(LIBS_USB)
 INCLUDES ?= -I../hidapi `pkg-config libusb-1.0 --cflags`
 
 
 # Console Test Program
-hidtest-libusb: $(COBJS_LIBUSB) $(CPPOBJS)
-	$(CXX) $(LDFLAGS) $^ $(LIBS_USB) -o $@
+hidtest-libusb: $(COBJS)
+	$(CC) $(LDFLAGS) $^ $(LIBS_USB) -o $@
 
 # Shared Libs
 libhidapi-libusb.so: $(COBJS_LIBUSB)
@@ -39,9 +35,6 @@ libhidapi-libusb.so: $(COBJS_LIBUSB)
 $(COBJS): %.o: %.c
 	$(CC) $(CFLAGS) -c $(INCLUDES) $< -o $@
 
-$(CPPOBJS): %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $(INCLUDES) $< -o $@
-
 
 clean:
 	rm -f $(OBJS) hidtest-libusb libhidapi-libusb.so ../hidtest/hidtest.o

diff --git a/linux/Makefile-manual b/linux/Makefile-manual
@@ -13,22 +13,18 @@ libs: libhidapi-hidraw.so
 CC       ?= gcc
 CFLAGS   ?= -Wall -g -fpic
 
-CXX      ?= g++
-CXXFLAGS ?= -Wall -g -fpic
-
 LDFLAGS  ?= -Wall -g
 
 
 COBJS     = hid.o ../hidtest/test.o
-CPPOBJS   =
-OBJS      = $(COBJS) $(CPPOBJS)
+OBJS      = $(COBJS)
 LIBS_UDEV = `pkg-config libudev --libs` -lrt
 LIBS      = $(LIBS_UDEV)
 INCLUDES ?= -I../hidapi `pkg-config libusb-1.0 --cflags`
 
 
 # Console Test Program
-hidtest-hidraw: $(COBJS) $(CPPOBJS)
+hidtest-hidraw: $(COBJS)
 	$(CC) $(LDFLAGS) $^ $(LIBS_UDEV) -o $@
 
 # Shared Libs
@@ -39,11 +35,8 @@ libhidapi-hidraw.so: $(COBJS)
 $(COBJS): %.o: %.c
 	$(CC) $(CFLAGS) -c $(INCLUDES) $< -o $@
 
-$(CPPOBJS): %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $(INCLUDES) $< -o $@
-
 
 clean:
-	rm -f $(OBJS) hidtest-hidraw libhidapi-hidraw.so $(COBJS) $(CPPOBJS)
+	rm -f $(OBJS) hidtest-hidraw libhidapi-hidraw.so $(COBJS)
 
 .PHONY: clean libs
diff --git a/mac/Makefile-manual b/mac/Makefile-manual
@@ -9,7 +9,6 @@
 all: hidtest
 
 CC=gcc
-CXX=g++
 COBJS=hid.o ../hidtest/test.o
 OBJS=$(COBJS)
 CFLAGS+=-I../hidapi -Wall -g -c 
@@ -22,10 +21,7 @@ hidtest: $(OBJS)
 $(COBJS): %.o: %.c
 	$(CC) $(CFLAGS) $< -o $@
 
-$(CPPOBJS): %.o: %.cpp
-	$(CXX) $(CFLAGS) $< -o $@
-
 clean:
-	rm -f *.o hidtest $(CPPOBJS)
+	rm -f *.o hidtest
 
 .PHONY: clean
diff --git a/windows/Makefile.mingw b/windows/Makefile.mingw
@@ -9,26 +9,21 @@
 all: hidtest libhidapi.dll
 
 CC=gcc
-CXX=g++
-COBJS=hid.o
-CPPOBJS=../hidtest/hidtest.o
-OBJS=$(COBJS) $(CPPOBJS)
+COBJS=hid.o ../hidtest/test.o
+OBJS=$(COBJS)
 CFLAGS=-I../hidapi -g -c
 LIBS= -lsetupapi
 DLL_LDFLAGS = -mwindows -lsetupapi
 
 hidtest: $(OBJS)
-	g++ -g $^ $(LIBS) -o hidtest
+	$(CC) -g $^ $(LIBS) -o hidtest
 
 libhidapi.dll: $(OBJS)
 	$(CC) -g $^ $(DLL_LDFLAGS) -o libhidapi.dll
 
 $(COBJS): %.o: %.c
 	$(CC) $(CFLAGS) $< -o $@
 
-$(CPPOBJS): %.o: %.cpp
-	$(CXX) $(CFLAGS) $< -o $@
-
 clean:
 	rm *.o ../hidtest/*.o hidtest.exe