aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-10-13 00:51:50 +0100
committerMatthew Wild <mwild1@gmail.com>2011-10-13 00:51:50 +0100
commit850d0923059feff9589bb7b68eb06662d4c08c79 (patch)
tree40f5585d294fc580bdabcf47e08fe09f59657af8
parentafd972f05b2ef093c395e4d0b8b01adcd3ad8e3e (diff)
downloadprosody-850d0923059feff9589bb7b68eb06662d4c08c79.tar.gz
prosody-850d0923059feff9589bb7b68eb06662d4c08c79.zip
Makefile, util-src/Makefile: Add .PHONY, reorganise util-src/Makefile
-rw-r--r--Makefile2
-rw-r--r--util-src/Makefile20
2 files changed, 13 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 51e376f0..1af6da63 100644
--- 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 1ca934ad..2c8243f9 100644
--- 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