From 4209aaaaed0c3c1744d8fae12f5df57c2ac21c3c Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jodersky@gmail.com>
Date: Mon, 4 Jun 2012 13:28:04 +0200
Subject: add program installation/uninstallation rules

---
 Makefile    | 20 ++++++++++++++++++--
 src/k8055.c |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 4320a61..212ffed 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
+PREFIX = /usr/local
 
-all: compile copy
+
+local: compile copy
 
 compile:
 	make -C src
@@ -23,12 +25,26 @@ doc: mkdirs
 #these commands must be run as root
 install-rules:
 	cp k8055.rules /etc/udev/rules.d/k8055.rules
+don't make shared libraries executable
 uninstall-rules:
 	rm /etc/udev/rules.d/k8055.rules
+
 install-permissions: install-rules
 	groupadd -f k8055
-	$(foreach user, $(users), usermod -a -G k8055 $(user);)
+	$(foreach user, $(USERS), usermod -a -G k8055 $(user);)
+
 uninstall-permissions: uninstall-rules
 	groupdel k8055
 
+install: compile
+	cp src/*.so $(PREFIX)/lib
+	cp src/*.h $(PREFIX)/include
+
+uninstall:
+	rm $(PREFIX)/lib/libk8055.so
+	rm $(PREFIX)/include/k8055.h
+	
+install-all: install install-permissions
+
+uninstall-all: uninstall-permissions uninstall
 
diff --git a/src/k8055.c b/src/k8055.c
index 51dcc49..4a2fd3e 100644
--- a/src/k8055.c
+++ b/src/k8055.c
@@ -443,5 +443,5 @@ int k8055_get_all_input(int port, int *bitmask, int *analog1, int *analog2, int
 }
 
 int k8055_quick_get_all_input(int port, int *bitmask, int *analog1, int *analog2, int *counter1, int *counter2) {
-	return getAllCycle(port, bitmask, analog1, analog2, counter1, counter2, 1);
+	return get_all_cycle(port, bitmask, analog1, analog2, counter1, counter2, 1);
 }
-- 
cgit v1.2.3