Fix makefiles.

diff --git a/Makefile b/Makefile
index 48af29634e28428b2f7a83fb86715a0a95ec9a6a..22b70d6c48d6d17a0f34cc6a495a4437619961de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,16 @@
-DIRS=lib
-DOCDIRS=
-DISTDIRS=
+# Set DESTDIR if it isn't given
+DESTDIR?=/
 
-.PHONY : all docs clean reallyclean test
+.PHONY : all clean install test
 
-all : docs
-       for d in ${DIRS}; do $(MAKE) -C $${d}; done
+all :
+       python ./setup.py build
 
-docs :
-       for d in ${DOCDIRS}; do $(MAKE) -C $${d}; done
+install : all
+       python ./setup.py install --root=${DESTDIR}
 
 clean :
-       for d in ${DIRS}; do $(MAKE) -C $${d} clean; done
-       for d in ${DOCDIRS}; do $(MAKE) -C $${d} clean; done
-       $(MAKE) -C test clean
+       -rm -rf build/ src/paho/mqtt/__pycache__ src/paho/mqtt/*.pyc src/paho/__pycache__ src/paho/*.pyc
 
-reallyclean : 
-       for d in ${DIRS}; do $(MAKE) -C $${d} reallyclean; done
-       for d in ${DOCDIRS}; do $(MAKE) -C $${d} reallyclean; done
-       $(MAKE) -C test reallyclean
-       -rm -f *.orig
-
-test :
+test : 
        $(MAKE) -C test test
-

diff --git a/lib/python/Makefile b/lib/python/Makefile
deleted file mode 100644 (file)
index 983a9c9..0000000
--- a/lib/python/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Set DESTDIR if it isn't given
-DESTDIR?=/
-
-.PHONY : all clean install
-
-all : mosquitto.pyc
-
-install : all
-       python ./setup.py install --prefix=${prefix} --root=${DESTDIR}
-
-mosquitto.pyc : mosquitto.py
-       python ./setup.py build
-
-clean :
-       -rm -rf build mosquitto.pyc __pycache__

diff --git a/test/Makefile b/test/Makefile
index d2a804b5edca2c5475fa539fa1b8c6d5bed52c38..3642b8e178ac1cbfcd41cc866ec153a201fc64d6 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -5,8 +5,5 @@ all :
 test :
        $(MAKE) -C lib test
 
-reallyclean : clean
-       -rm -f *.orig
-
 clean : 
        $(MAKE) -C lib clean