X-Git-Url: http://git.kpe.io/?p=snark14.git;a=blobdiff_plain;f=Makefile;h=6d96e10ae93491e936baac8029d3232ddede17a5;hp=e0b36a68847f74ca2ee554dd81f864c0af0668a9;hb=e08781393afc0bd73e7335a36003b39ccc11122f;hpb=4b9c63b0ad3bac6407cf563e382746a7f5ba8aec diff --git a/Makefile b/Makefile index e0b36a6..6d96e10 100644 --- a/Makefile +++ b/Makefile @@ -28,10 +28,11 @@ 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 -L$(XERCES)/lib +LIBPATH = -L$(PREFIX)/lib +LIBS = $(LIBPATH) -lm -lxerces-c -lDIGFile -lDIGFileSnark -lDIGRand SNARK14 = snark14 INPUT = snark14Input @@ -44,7 +45,7 @@ DISPLAY_INC = $(foreach dir,tools/Display,$(wildcard tools/Display/*.hpp)) all: $(OBJDIR) $(LIBSDIR) $(BINDIR) $(BINDIR)/$(SNARK14) $(BINDIR)/$(DISPLAY) $(BINDIR)/$(INPUT) $(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