V40

1 files changed, 41 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index bf8155e..5a0ba83 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ SIZE     = size
 SHLIB    = gcc -shared
 STRIPLIB = strip --strip-unneeded
 
-CFLAGS	+= -O3 -Wall
+CFLAGS	+= -O3 -Wall -pthread
 
 LIB1     = libpigpio.so
 OBJ1     = pigpio.o command.o
@@ -14,13 +14,18 @@ OBJ1     = pigpio.o command.o
 LIB2     = libpigpiod_if.so
 OBJ2     = pigpiod_if.o command.o
 
-LIB      = $(LIB1) $(LIB2)
+LIB3     = libpigpiod_if2.so
+OBJ3     = pigpiod_if2.o command.o
 
-ALL     = $(LIB) x_pigpio x_pigpiod_if pig2vcd pigpiod pigs
+LIB      = $(LIB1) $(LIB2) $(LIB3)
 
-LL1      = -L. -lpigpio -lpthread -lrt
+ALL     = $(LIB) x_pigpio x_pigpiod_if x_pigpiod_if2 pig2vcd pigpiod pigs
 
-LL2      = -L. -lpigpiod_if -lpthread -lrt
+LL1      = -L. -lpigpio -pthread -lrt
+
+LL2      = -L. -lpigpiod_if -pthread -lrt
+
+LL3      = -L. -lpigpiod_if2 -pthread -lrt
 
 all:	$(ALL)
 
@@ -30,6 +35,9 @@ pigpio.o: pigpio.c pigpio.h command.h custom.cext
 pigpiod_if.o: pigpiod_if.c pigpio.h command.h pigpiod_if.h
 	$(CC) $(CFLAGS) -fpic -c -o pigpiod_if.o pigpiod_if.c
 
+pigpiod_if2.o: pigpiod_if2.c pigpio.h command.h pigpiod_if2.h
+	$(CC) $(CFLAGS) -fpic -c -o pigpiod_if2.o pigpiod_if2.c
+
 command.o: command.c pigpio.h command.h
 	$(CC) $(CFLAGS) -fpic -c -o command.o command.c
 
@@ -39,6 +47,9 @@ x_pigpio:	x_pigpio.o $(LIB1)
 x_pigpiod_if:	x_pigpiod_if.o $(LIB2)
 	$(CC) -o x_pigpiod_if x_pigpiod_if.o $(LL2)
 
+x_pigpiod_if2:	x_pigpiod_if2.o $(LIB3)
+	$(CC) -o x_pigpiod_if2 x_pigpiod_if2.o $(LL3)
+
 pigpiod:	pigpiod.o $(LIB1)
 	$(CC) -o pigpiod pigpiod.o $(LL1)
 
@@ -52,30 +63,34 @@ clean:
 	rm -f *.o *.i *.s *~ $(ALL)
 
 install:	$(ALL)
-	install -m 0755 -d               /opt/pigpio/cgi
-	install -m 0755 -d               /usr/local/include
-	install -m 0644 pigpio.h         /usr/local/include
-	install -m 0644 pigpiod_if.h     /usr/local/include
-	install -m 0755 -d               /usr/local/lib
-	install -m 0755 libpigpio.so     /usr/local/lib
-	install -m 0755 libpigpiod_if.so /usr/local/lib
-	install -m 0755 -d               /usr/local/bin
-	install -m 0755 -s pig2vcd       /usr/local/bin
-	install -m 0755 -s pigpiod       /usr/local/bin
-	install -m 0755 -s pigs          /usr/local/bin
+	install -m 0755 -d                /opt/pigpio/cgi
+	install -m 0755 -d                /usr/local/include
+	install -m 0644 pigpio.h          /usr/local/include
+	install -m 0644 pigpiod_if.h      /usr/local/include
+	install -m 0644 pigpiod_if2.h     /usr/local/include
+	install -m 0755 -d                /usr/local/lib
+	install -m 0755 libpigpio.so      /usr/local/lib
+	install -m 0755 libpigpiod_if.so  /usr/local/lib
+	install -m 0755 libpigpiod_if2.so /usr/local/lib
+	install -m 0755 -d                /usr/local/bin
+	install -m 0755 -s pig2vcd        /usr/local/bin
+	install -m 0755 -s pigpiod        /usr/local/bin
+	install -m 0755 -s pigs           /usr/local/bin
 	if which python2; then python2 setup.py install; fi
 	if which python3; then python3 setup.py install; fi
-	install -m 0755 -d               /usr/local/man/man1
-	install -m 0644 *.1              /usr/local/man/man1
-	install -m 0755 -d               /usr/local/man/man3
-	install -m 0644 *.3              /usr/local/man/man3
+	install -m 0755 -d                /usr/local/man/man1
+	install -m 0644 *.1               /usr/local/man/man1
+	install -m 0755 -d                /usr/local/man/man3
+	install -m 0644 *.3               /usr/local/man/man3
 	ldconfig
 
 uninstall:
 	rm -f /usr/local/include/pigpio.h
 	rm -f /usr/local/include/pigpiod_if.h
+	rm -f /usr/local/include/pigpiod_if2.h
 	rm -f /usr/local/lib/libpigpio.so
 	rm -f /usr/local/lib/libpigpiod_if.so
+	rm -f /usr/local/lib/libpigpiod_if2.so
 	rm -f /usr/local/bin/pig2vcd
 	rm -f /usr/local/bin/pigpiod
 	rm -f /usr/local/bin/pigs
@@ -95,6 +110,11 @@ $(LIB2):	$(OBJ2)
 	$(STRIPLIB) $(LIB2)
 	$(SIZE)     $(LIB2)
 
+$(LIB3):	$(OBJ3)
+	$(SHLIB) -o $(LIB3) $(OBJ3)
+	$(STRIPLIB) $(LIB3)
+	$(SIZE)     $(LIB3)
+
 # generated using gcc -MM *.c
 
 pig2vcd.o: pig2vcd.c pigpio.h
@@ -102,3 +122,4 @@ pigpiod.o: pigpiod.c pigpio.h
 pigs.o: pigs.c pigpio.h command.h
 x_pigpio.o: x_pigpio.c pigpio.h
 x_pigpiod_if.o: x_pigpiod_if.c pigpiod_if.h pigpio.h
+x_pigpiod_if2.o: x_pigpiod_if2.c pigpiod_if2.h pigpio.h