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

diff --git a/Makefile b/Makefile
index 6f4b774f22f1e5d4435fe04d57e346b654c8a05e..19e177fc602825e00786c3b3830b3825b86f9b14 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile to build an instance of snark14
 
 PREFIX     = .
-XERCES     = ~/snark14kmr
+XERCES     = .
 
 CC         = gcc
 CXX        = g++
@@ -24,7 +24,7 @@ LIBSDIR    = lib
 LDIGFILED  = $(LIBSDIR)/libDIGFile.so
 LDIGFILESD = $(LIBSDIR)/libDIGFileSnark.so
 LDIGFILERD = $(LIBSDIR)/libDIGRand.so
-LSNARK14   = $(LIBSDIR)/libsnark14.a
+LSNARK14   = $(LIBSDIR)/libsnark14.so
 
 SRC_CXX    = $(foreach dir,src/snark,$(wildcard src/snark/*.cpp))
 SRC_C      = $(foreach dir,src/snark,$(wildcard src/snark/*.c))
@@ -32,7 +32,6 @@ OBJ_CXX    = $(patsubst src/snark/%.cpp,build/%.o,$(SRC_CXX))
 OBJ_C      = $(patsubst src/snark/%.c,build/%.o,$(SRC_C))
 INCLUDES   = -I./include $(addprefix -I,$(DIGFILED),$(DIGFILESD),$(DIGFILERD)) -Iinclude/DIGFile -Iinclude/DIGFileSnark -Iinclude/DIGRand -I/usr/include
 
-#LIBPATH   = -L$(PREFIX)/lib -L$(XERCES)/lib
 LIBPATH   = -L$(PREFIX)/lib
 LIBS      = $(LIBPATH) -lm -lxerces-c -lDIGFile -lDIGFileSnark -lDIGRand
 
@@ -43,10 +42,10 @@ 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) $(LSNARK14)
 
-all: $(OBJDIR) $(LIBSDIR) $(BINDIR) $(BINDIR)/$(SNARK14) $(BINDIR)/$(DISPLAY) $(BINDIR)/$(INPUT)
-
-$(BINDIR)/$(SNARK14): $(LDIGFILED) $(LDIGFILESD) $(LDIGFILERD) $(OBJ_C) $(OBJ_CXX) $(LSNARK14)
+$(BINDIR)/$(SNARK14): $(LDIGFILED) $(LDIGFILESD) $(LDIGFILERD) $(OBJ_C) $(OBJ_CXX)
        $(LD) $(LIBPATH) $(LDFLAGS) $(OBJ_C) $(OBJ_CXX) $(LIBS) -o bin/$(SNARK14)
 
 $(BINDIR)/$(DISPLAY): $(DISPLAY_SRC) $(DISPLAY_INC)
@@ -55,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 $@ $<
@@ -73,7 +74,7 @@ $(LDIGFILESD) : $(DIGFILESD)
 $(LDIGFILERD) : $(DIGFILERD)
        $(MAKE) --directory=$<
 
-$(LSNARK14) : $(SNARK14D)
+$(LSNARK14) : $(SNARK14D) $(BINDIR)/$(SNARK14)
        $(MAKE) --directory=$<
 
 $(OBJDIR):

diff --git a/src/snark/Makefile b/src/snark/Makefile
index eee44fb0064aede0e81fda48b6b968f786cf27c3..d22e236167457d29dfeb5474e1ee3fe4a37962eb 100644 (file)
--- a/src/snark/Makefile
+++ b/src/snark/Makefile
@@ -35,10 +35,10 @@ all: $(LIBDIR) $(TARGET)
 $(TARGET): $(OBJ_CXX) $(OBJ_CC)
        $(LD) --shared $(LIBS) $(LDFLAGS) -o $(TARGET) $(OBJ_CXX) $(OBJ_CC)
 
-/%.o : ./%.c .deps/%.Po
+../../build/%.o : ./%.c .deps/%.Po
        $(CC) -c $(CFLAGS) $(INCLUDES) -MT $@ -MD -MP -MF $(word 2,$^) -o $@ $<
 
-%.o : ./%.cpp .deps/%.Po
+../../build/%.o : ./%.cpp .deps/%.Po
        $(CXX) -c $(CXXFLAGS) $(INCLUDES) -MT $@ -MD -MP -MF $(word 2,$^) -o $@ $<
 
 $(LIBDIR) :