Merge pull request #2 from makoshark/master

[wikiq] / Makefile

diff --git a/Makefile b/Makefile
index e1d898a740de586ff5b22c5ae9cee7d56805d17e..cc0e56f806924b23304046c2361bfdce5c541001 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,21 @@
-CXX = g++
-CFLAGS = -O3
-OBJECTS = disorder.o md5.o
+CXXFLAGS = -O3 
+CFLAGS = $(CXXFLAGS)
+OBJECTS = wikiq.o md5.o disorder.o 
 
 all: wikiq
 
-wikiq: wikiq.cpp $(OBJECTS)
-       $(CXX) $(CFLAGS) wikiq.cpp $(OBJECTS) -o wikiq -lexpat
+wikiq: $(OBJECTS)
+       $(CXX) $(CXXFLAGS) $(OBJECTS) -lpcrecpp -lpcre -lexpat -o wikiq
 
-disorder.o: disorder.c disorder.h
-       $(CXX) $(CFLAGS) -c disorder.c
-
-md5.o: md5.c md5.h
-       $(CXX) $(CFLAGS) -c md5.c -lm
+disorder.o: disorder.h
+md5.o: md5.h
 
 clean:
        rm -f wikiq $(OBJECTS)
 
+static: $(OBJECTS)
+       $(CXX) $(CXXFLAGS) $(OBJECTS) -static -lpcrecpp -lpcre -lexpat -o wikiq
+
 gprof:
        $(MAKE) CFLAGS=-pg wikiq