Makefile, util-src/Makefile: Add .PHONY, reorganise util-src/Makefile

diff --git a/Makefile b/Makefile
index 51e376f04fe02c10a51b9d4b2bda8b6c0b0612f7..1af6da639b7ce27f8fda42a0ac15c862350ccc40 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,8 @@ INSTALLEDCONFIG = $(SYSCONFDIR)
 INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules
 INSTALLEDDATA = $(DATADIR)
 
+.PHONY: all clean install
+
 all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version
        $(MAKE) -C util-src install
 

diff --git a/util-src/Makefile b/util-src/Makefile
index 1ca934ad6d3baa6e7ee78359a939fc302342d6a0..2c8243f90512738e9fad37c0d45f7586b50c74c6 100644 (file)
--- a/util-src/Makefile
+++ b/util-src/Makefile
@@ -10,8 +10,19 @@ CC?=gcc
 CXX?=g++
 LD?=gcc
 
+.PHONY: all install clean
 .SUFFIXES: .c .o .so
 
+all: encodings.so hashes.so pposix.so signal.so
+
+install: encodings.so hashes.so pposix.so signal.so
+       install *.so ../util/
+
+clean:
+       rm -f *.o
+       rm -f *.so
+       rm -f ../util/*.so
+
 encodings.so: encodings.o
        MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
        $(CC) -o $@ $< $(LDFLAGS) $(IDNA_LIBS)
@@ -27,12 +38,3 @@ hashes.so: hashes.o
        MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
        $(LD) -o $@ $< $(LDFLAGS)
 
-all: encodings.so hashes.so pposix.so signal.so
-
-install: encodings.so hashes.so pposix.so signal.so
-       install *.so ../util/
-
-clean:
-       rm -f *.o
-       rm -f *.so
-       rm -f ../util/*.so