V10

1 files changed, 40 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index 8684ac6..6ce0b3d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,61 +5,74 @@ SIZE    = size
 
 CFLAGS	= -O3 -Wall
 
-ALL     = libpigpio.a checklib demolib pig2vcd pigpiod pigs
+LIB1     = libpigpio.a
+OBJ1     = pigpio.o command.o
 
-all:	$(ALL)
+LIB2     = libpigpiod_if.a
+OBJ2     = pigpiod_if.o command.o
 
-checklib:	checklib.o libpigpio.a
-	$(CC) -o checklib checklib.c -L. -lpigpio -lpthread -lrt
+LIB      = $(LIB1) $(LIB2)
 
-demolib:	demolib.o libpigpio.a
-	$(CC) -o demolib demolib.c -L. -lpigpio -lpthread -lrt
+ALL     = $(LIB) checklib pig2vcd pigpiod pigs
 
-pig2vcd:	pig2vcd.o
-	$(CC) -o pig2vcd pig2vcd.c
+LL      = -L. -lpigpio -lpthread -lrt
+
+all:	$(ALL)
 
-pigpiod:	pigpiod.o libpigpio.a
-	$(CC) -o pigpiod pigpiod.c -L. -lpigpio -lpthread -lrt
+checklib:	checklib.o $(LIB1)
+	$(CC) -o checklib checklib.c $(LL)
 
-pigs:		command.o
+pigpiod:	pigpiod.o $(LIB1)
+	$(CC) -o pigpiod pigpiod.c $(LL)
+
+pigs:		pigs.o command.o
 	$(CC) -o pigs pigs.c command.c
 
+pig2vcd:	pig2vcd.o
+	$(CC) -o pig2vcd pig2vcd.c
+
 clean:
 	rm -f *.o *.i *.s *~ $(ALL)
 
 install:	$(LIB) 
-	sudo install -m 0755 -d          /usr/local/include
-	sudo install -m 0644 pigpio.h    /usr/local/include
-	sudo install -m 0755 -d          /usr/local/lib
-	sudo install -m 0644 libpigpio.a /usr/local/lib
-	sudo install -m 0755 -d          /usr/local/bin
-	sudo install -m 0755 pig2vcd     /usr/local/bin
-	sudo install -m 0755 pigpiod     /usr/local/bin
-	sudo install -m 0755 pigs        /usr/local/bin
+	sudo install -m 0755 -d              /usr/local/include
+	sudo install -m 0644 pigpio.h        /usr/local/include
+	sudo install -m 0644 pigpiod_if.h    /usr/local/include
+	sudo install -m 0755 -d              /usr/local/lib
+	sudo install -m 0644 libpigpio.a     /usr/local/lib
+	sudo install -m 0644 libpigpiod_if.a /usr/local/lib
+	sudo install -m 0755 -d              /usr/local/bin
+	sudo install -m 0755 pig2vcd         /usr/local/bin
+	sudo install -m 0755 pigpiod         /usr/local/bin
+	sudo install -m 0755 pigs            /usr/local/bin
 	sudo python setup.py install
 
 uninstall:
 	sudo rm -f /usr/local/include/pigpio.h
+	sudo rm -f /usr/local/include/pigpiod_if.h
 	sudo rm -f /usr/local/lib/libpigpio.a
+	sudo rm -f /usr/local/lib/libpigpiod_if.a
 	sudo rm -f /usr/local/bin/pig2vcd
 	sudo rm -f /usr/local/bin/pigpiod
 	sudo rm -f /usr/local/bin/pigs
 
-LIB     = libpigpio.a
-OBJ     = pigpio.o command.o
+$(LIB1):	$(OBJ1)
+	$(AR) rcs $(LIB1) $(OBJ1)
+	$(RANLIB) $(LIB1)
+	$(SIZE)   $(LIB1)
 
-$(LIB):	$(OBJ)
-	$(AR) rcs $(LIB) $(OBJ)
-	$(RANLIB) $(LIB)
-	$(SIZE)   $(LIB)
+$(LIB2):	$(OBJ2)
+	$(AR) rcs $(LIB2) $(OBJ2)
+	$(RANLIB) $(LIB2)
+	$(SIZE)   $(LIB2)
 
-# generated using gcc -M *.c
+# generated using gcc -MM *.c
 
 checklib.o: checklib.c pigpio.h
 command.o: command.c pigpio.h command.h
-demolib.o: demolib.c pigpio.h
 pig2vcd.o: pig2vcd.c pigpio.h
 pigpio.o: pigpio.c pigpio.h command.h
 pigpiod.o: pigpiod.c pigpio.h command.h
+pigpiod_if.o: pigpiod_if.c pigpio.h command.h pigpiod_if.h
 pigs.o: pigs.c pigpio.h command.h