Description: Fix the build system
Author: Simon Richter <sjr@debian.org>
Last-Update: 2013-04-04

Index: langford-0.0.20130221/Makefile
===================================================================
--- langford-0.0.20130221.orig/Makefile	2013-04-06 20:40:09.489177933 +0200
+++ langford-0.0.20130221/Makefile	2013-04-06 20:43:06.077181248 +0200
@@ -1,31 +1,7 @@
 obj-m = langford.o
 KVERSION = $(shell uname -r)
 
-all: langford.ko langford_util langford_adc_util
-
-langford.ko: langford.c
-	export CCFLAGS="-ansi -Wall"
-	sudo make -C /lib/modules/$(KVERSION)/build M=$(PWD) modules
-
-install: langford.ko langford_util langford_adc_util
-	#Ensure module recompilation everytime it needs to be installed.
-	#(Prevents module version errors after kernel upgrades.) 
-	-sudo rm -f langford.ko
-	-sudo rm -rf /dev/langford
-	-sudo modprobe -r langford
-	make langford.ko
-	sudo cp langford.ko /lib/modules/`uname -r`/kernel/drivers/misc
-	sudo depmod -a
-	sudo modprobe langford
-#Allow some time for driver to finish loading. If driver does not complete loading, no character device will be registered and mknod will fail.
-	sleep 3
-	sync
-	sudo cp langford_util /usr/bin
-	sudo cp langford_adc_util /usr/bin
-	sudo cp langford_init /usr/bin
-	sudo chmod a+rx /usr/bin/langford_util
-	make -C libs/ install
-	echo "Remember to run langford_init in order to initialize the device at /dev/langford"	
+all: langford_util langford_adc_util libs
 
 langford_util: langford_util.cpp
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
@@ -34,21 +10,15 @@
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
 
 libs:
-	make -f libs/Makefile
+	$(MAKE) -C libs/
 
 clean:
-	-sudo make -C /lib/modules/$(KVERSION)/build M=$(PWD) clean
-	-sudo rm -rf langford.ko.gz langford_util langford_adc_util
-	make -C libs/ clean
+	$(RM) -r langford.ko.gz langford_util langford_adc_util
+	$(MAKE) -C libs/ clean
 
 distclean: clean
-	-sudo make -C ./ clean
-	-sudo rm -rf .tmp*
-	-sudo rm -rf *~
-	#-sudo rm modules.order Module.symvers
-
-uninstall:
-	-sudo rm /usr/bin/langford_util
-	-sudo rm /usr/bin/langford_init
-	-sudo rm /usr/bin/langford_adc_util
-	make -C libs/ uninstall
+	$(MAKE) -C libs/ distclean
+	$(RM) -r .tmp*
+	$(RM) -r *~
+
+.PHONY: libs
Index: langford-0.0.20130221/libs/Makefile
===================================================================
--- langford-0.0.20130221.orig/libs/Makefile	2013-04-06 20:40:09.489177933 +0200
+++ langford-0.0.20130221/libs/Makefile	2013-04-06 20:40:09.485177933 +0200
@@ -10,13 +10,6 @@
 langford_rx_rf_bb_vga: $(VGASRC)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
 
-install: langford_rf_fsynth langford_rx_rf_bb_vga
-	sudo cp langford_rx_rf_bb_vga langford_rf_fsynth /usr/bin
-	sudo chmod a+rx /usr/bin/langford_rx_rf_bb_vga /usr/bin/langford_rf_fsynth
-
-uninstall:
-	-sudo rm -rf /usr/bin/langford_rx_rf_bb_vga /usr/bin/langford_rf_fsynth
-
-clean:
-	-sudo rm -rf langford_rf_fsynth langford_rx_rf_bb_vga
+clean distclean:
+	$(RM) langford_rf_fsynth langford_rx_rf_bb_vga
 
