Updated install files

INSTALL

@@ -66,3 +66,12 @@ and placed in the /opt/firmware-mod-kit directory:
 	$ git clone https://code.google.com/p/firmware-mod-kit /opt/firmware-mod-kit/
 	$ cd /opt/firmware-mod-kit/src && ./configure && make
 
+
+
+UNINSTALL
+----------------------------------
+
+The following command will remove all installed libraries and modules (except for the extraction/optional dependencies):
+
+	$ sudo make uninstall
+

Makefile.in

@@ -3,10 +3,10 @@ SRC_C_DIR="./src/C"
 
 .PHONY: all install build dependencies clean uninstall
 
-all: install
+all: build
 
 install: build
-	make -c $(SRC_C_DIR) install
+	make -C $(SRC_C_DIR) install
 	$(PYTHON) ./setup.py install
 
 build:

setup.py

@@ -122,7 +122,7 @@ if "install" in sys.argv:
 	print("checking pre-requisites")
 	try:
 		import pyqtgraph
-		import QtPyWhatever
+		from pyqtgraph.Qt import QtCore, QtGui, QtOpenGL
 	except ImportError as e:
 		msg = ["Pre-requisite check warning: " + str(e),
 			   "To take advantage of this %s's graphing capabilities, please install this module." % MODULE_NAME,

src/C/Makefile.in

@@ -7,7 +7,7 @@ export exec_prefix=@exec_prefix@
 export LIBDIR=@libdir@
 export INSTALL_OPTIONS=@INSTALL_OPTIONS@
 
-.PHONY: all install clean distclean
+.PHONY: all install clean distclean uninstall
 
 all:
 	make -C miniz
@@ -29,3 +29,8 @@ distclean:
 	make -C compress distclean
 	make -C fuzzy distclean
 	rm -rf *.cache config.* Makefile
+
+uninstall:
+	make -C miniz uninstall
+	make -C compress uninstall
+	make -C fuzzy uninstall

src/C/compress/Makefile

@@ -11,6 +11,9 @@ compress42.o:
 install:
 	install $(INSTALL_OPTIONS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
 
+uninstall:
+	rm -rf $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+
 .PHONY: clean distclean
 
 clean:

src/C/compress/test.py

-#!/usr/bin/env python
-
-import sys
-import ctypes
-import ctypes.util
-
-SIZE = 64
-
-try:
-	data = open(sys.argv[1], "rb").read(SIZE)
-except:
-	print "Usage: %s <input file>" % sys.argv[0]
-	sys.exit(1)
-
-comp = ctypes.cdll.LoadLibrary(ctypes.util.find_library("compress42"))
-
-if comp.is_compressed(data, len(data)):
-	print "%s is compress'd." % (sys.argv[1])
-else:
-	print "%s is not compress'd." % sys.argv[1]

src/C/miniz/Makefile

@@ -11,6 +11,9 @@ tinfl.o:
 install:
 	install $(INSTALL_OPTIONS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
 
+uninstall:
+	rm -rf $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+
 .PHONY: clean distclean
 
 clean:

src/C/miniz/test.py

-#!/usr/bin/env python
-
-import sys
-import ctypes
-import ctypes.util
-
-SIZE = 33*1024
-
-try:
-	data = open(sys.argv[1], "rb").read(SIZE)
-except:
-	print "Usage: %s <input file>" % sys.argv[0]
-	sys.exit(1)
-
-tinfl = ctypes.cdll.LoadLibrary(ctypes.util.find_library("tinfl"))
-
-if tinfl.is_deflated(data, len(data), 0):
-	print "%s is deflated." % (sys.argv[1])
-	print "Inflated to %d bytes!" % tinfl.inflate_raw_file(sys.argv[1], sys.argv[1] + '.inflated')
-else:
-	print "%s is not deflated." % sys.argv[1]