Merge branch 'master' of ssh://tiger.med-info.com:8822/srv/git/snark14kmr

[snark14.git] / Makefile

diff --git a/Makefile b/Makefile
index e0b36a68847f74ca2ee554dd81f864c0af0668a9..19e177fc602825e00786c3b3830b3825b86f9b14 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile to build an instance of snark14
 
 PREFIX     = .
-XERCES     = /usr/local/snark14
+XERCES     = .
 
 CC         = gcc
 CXX        = g++
@@ -15,6 +15,7 @@ LDFLAGS   =
 DIGFILED   = $(PREFIX)/src/DIGFile
 DIGFILESD  = $(PREFIX)/src/DIGFileSnark
 DIGFILERD  = $(PREFIX)/src/DIGRand
+SNARK14D   = $(PREFIX)/src/snark
 
 OBJDIR     = build
 BINDIR     = bin
@@ -23,15 +24,16 @@ LIBSDIR    = lib
 LDIGFILED  = $(LIBSDIR)/libDIGFile.so
 LDIGFILESD = $(LIBSDIR)/libDIGFileSnark.so
 LDIGFILERD = $(LIBSDIR)/libDIGRand.so
+LSNARK14   = $(LIBSDIR)/libsnark14.so
 
 SRC_CXX    = $(foreach dir,src/snark,$(wildcard src/snark/*.cpp))
 SRC_C      = $(foreach dir,src/snark,$(wildcard src/snark/*.c))
 OBJ_CXX    = $(patsubst src/snark/%.cpp,build/%.o,$(SRC_CXX))
 OBJ_C      = $(patsubst src/snark/%.c,build/%.o,$(SRC_C))
-INCLUDES   = -I./include -I$(XERCES)/include $(addprefix -I,$(DIGFILED),$(DIGFILESD),$(DIGFILERD)) -Iinclude/DIGFile -Iinclude/DIGFileSnark -Iinclude/DIGRand -I/usr/include
+INCLUDES   = -I./include $(addprefix -I,$(DIGFILED),$(DIGFILESD),$(DIGFILERD)) -Iinclude/DIGFile -Iinclude/DIGFileSnark -Iinclude/DIGRand -I/usr/include
 
-LIBPATH   = -L$(PREFIX)/lib -L$(XERCES)/lib
-LIBS      = $(LIBPATH) -lm -lxerces-c -lxerces-depdom -lDIGFile -lDIGFileSnark -lDIGRand
+LIBPATH   = -L$(PREFIX)/lib
+LIBS      = $(LIBPATH) -lm -lxerces-c -lDIGFile -lDIGFileSnark -lDIGRand
 
 SNARK14    = snark14
 INPUT      = snark14Input
@@ -40,11 +42,11 @@ INPUT_INC  = $(foreach dir,tools/Input,$(wildcard tools/Input/*.h))
 DISPLAY    = snark14Display
 DISPLAY_SRC  = $(foreach dir,tools/Display,$(wildcard tools/Display/*.cpp))
 DISPLAY_INC  = $(foreach dir,tools/Display,$(wildcard tools/Display/*.hpp))
-
-all: $(OBJDIR) $(LIBSDIR) $(BINDIR) $(BINDIR)/$(SNARK14) $(BINDIR)/$(DISPLAY) $(BINDIR)/$(INPUT)
+ 
+all: $(OBJDIR) $(LIBSDIR) $(BINDIR) $(BINDIR)/$(SNARK14) $(BINDIR)/$(DISPLAY) $(BINDIR)/$(INPUT) $(LSNARK14)
 
 $(BINDIR)/$(SNARK14): $(LDIGFILED) $(LDIGFILESD) $(LDIGFILERD) $(OBJ_C) $(OBJ_CXX)
-       $(LD) $(LIBS) $(LDFLAGS) -o bin/$(SNARK14) $(OBJ_C) $(OBJ_CXX)
+       $(LD) $(LIBPATH) $(LDFLAGS) $(OBJ_C) $(OBJ_CXX) $(LIBS) -o bin/$(SNARK14)
 
 $(BINDIR)/$(DISPLAY): $(DISPLAY_SRC) $(DISPLAY_INC)
        cd tools/Display ; make
@@ -52,11 +54,13 @@ $(BINDIR)/$(DISPLAY): $(DISPLAY_SRC) $(DISPLAY_INC)
 $(BINDIR)/$(INPUT): $(INPUT_SRC) $(INPUT_INC)
        cd tools/Input ; make
 
-$(OBJDIR)/%.o : src/snark/%.c src/snark/.deps/%.Po
-       $(CC) -c $(CFLAGS) $(INCLUDES) -MT $@ -MD -MP -MF $(word 2,$^) -o $@ $<
+$(OBJDIR)/%.o : src/snark/%.c #src/snark/.deps/%.Po
+#      $(CC) -c $(CFLAGS) $(INCLUDES) -MT $@ -MD -MP -MF $(word 2,$^) $< -o $@ 
+       $(CC) -c $(CFLAGS) $(INCLUDES) -MT $@ -MD -MP $< -o $@ 
 
-$(OBJDIR)/%.o : src/snark/%.cpp src/snark/.deps/%.Po
-       $(CXX) -c $(CXXFLAGS) $(INCLUDES) -MT $@ -MD -MP -MF $(word 2,$^) -o $@ $<
+$(OBJDIR)/%.o : src/snark/%.cpp #src/snark/.deps/%.Po
+#      $(CXX) -c $(CXXFLAGS) $(INCLUDES) -MT $@ -MD -MP -MF $(word 2,$^) -o $@ $<
+       $(CXX) -c $(CXXFLAGS) $(INCLUDES) -MT $@ -MD -MP -o $@ $<
 
 $(OBJDIR)/bckray.o : src/snark/bckray.cpp
        $(CXX) -c $(CXXFLAGS) $(INCLUDES) -MT $@ -MD -MP -o $@ $<
@@ -70,6 +74,9 @@ $(LDIGFILESD) : $(DIGFILESD)
 $(LDIGFILERD) : $(DIGFILERD)
        $(MAKE) --directory=$<
 
+$(LSNARK14) : $(SNARK14D) $(BINDIR)/$(SNARK14)
+       $(MAKE) --directory=$<
+
 $(OBJDIR):
        @mkdir -p $@