From 94f56c96530e9fe0cf121b350b3b1198d788d91d Mon Sep 17 00:00:00 2001 From: Roger Light Date: Mon, 17 Jun 2013 09:35:23 +0100 Subject: [PATCH] Fix makefiles. --- Makefile | 28 +++++++++------------------- lib/python/Makefile | 15 --------------- test/Makefile | 3 --- 3 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 lib/python/Makefile diff --git a/Makefile b/Makefile index 48af296..22b70d6 100644 --- 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 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 d2a804b..3642b8e 100644 --- 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 -- 2.39.5