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

[wikiq] / Makefile

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

 
 all: wikiq
 
 
 all: wikiq
 

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

 
 

-disorder.o: disorder.c
-       $(CXX) $(CFLAGS) -c disorder.c
+md5.o: md5.h

 
 clean:
        rm -f wikiq $(OBJECTS)
 
 
 clean:
        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