Merge branch 'master' of github.com:ekg/wikiq

[wikiq] / Makefile

diff --git a/Makefile b/Makefile
index bf436d02fd47dfc4bdf8705f64085cc6f009e13f..b7df4717f1748f2c548b6ac42bed89844d2c1370 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,19 @@
-CXX = g++
-CFLAGS = -O3
+CXXFLAGS = -O3 
+CFLAGS = $(CXXFLAGS)
+OBJECTS = wikiq.o md5.o 

 
 all: wikiq
 
 
 all: wikiq
 

-wikiq: wikiq.c
-       $(CXX) $(CFLAGS) wikiq.c -o wikiq -lexpat
+wikiq: $(OBJECTS)
+       $(CXX) $(CXXFLAGS) $(OBJECTS) -lpcrecpp -lpcre -lexpat -o wikiq
+
+md5.o: md5.h

 
 clean:
 
 clean:

-       rm -f wikiq
+       rm -f wikiq $(OBJECTS)
+
+static: $(OBJECTS)
+       $(CXX) $(CXXFLAGS) $(OBJECTS) -static -lpcrecpp -lpcre -lexpat -o wikiq

 
 gprof:
        $(MAKE) CFLAGS=-pg wikiq
 
 gprof:
        $(MAKE) CFLAGS=-pg wikiq