[med-svn] [Git][med-team/gjh-asl-json][master] fix Makefile

[Andrei Rozanski]

Andrei Rozanski pushed to branch master at Debian Med / gjh-asl-json


Commits:
a26373b7 by Andrei Rozanski at 2020-09-30T21:38:26+02:00
fix Makefile

- - - - -


1 changed file:

- Makefile


Changes:

=====================================
Makefile
=====================================
@@ -1,30 +1,34 @@
 SRC=src
-INC_DIR = /usr/include/ampl-netlib-solvers/
-LIB = /usr/lib/x86_64-linux-gnu/
-PREFIX=.
+TPL=Thirdparty
 
+PREFIX=.
 BIN=$(PREFIX)/bin
 
 # Override this to inject gcov flags "-coverage -O0"
 # in travis CI script. E.g., $ make COVERAGE="-coverage -O0"
 COVERAGE=-O3
 
-CINC=-I$(SRC) -I$(LIB) -I$(INC_DIR)
+CINC=-I$(SRC) -I$(TPL)/solvers
 CFLAGS= -pipe -DASL_BUILD -fPIC -DPIC -Wall
 LDFLAGS=-ldl
 
-all: 	$(BIN)/gjh_asl_json
+all: 	$(TPL)/solvers/amplsolver.a \
+	$(BIN)/gjh_asl_json
 
 $(BIN)/gjh_asl_json: $(SRC)/gjh_asl_json.o \
 	             $(SRC)/AmplInterface.o \
-		     $(lib)/libamplsolver.a
+		     $(TPL)/solvers/amplsolver.a
 	@mkdir -p $(BIN)
 	$(CXX) $(COVERAGE) $(CFLAGS) $(CINC) $^ $(LDFLAGS) -o $@
 
 %.o : %.cpp $(SRC)/AmplInterface.hpp
 	$(CXX) $(COVERAGE) $(CFLAGS) $(CINC) -c $< -o $@
 
+$(TPL)/solvers/amplsolver.a :
+	make -C $(TPL)/solvers/;
+
 clean:
 	rm -f $(BIN)/gjh_asl_json;
 	rm -f $(SRC)/*.o
 	rm -f $(SRC)/*~
+	make clean -C $(TPL)/solvers;



View it on GitLab: https://salsa.debian.org/med-team/gjh-asl-json/-/commit/a26373b749bf2da1ca4666b11fa07c26f4f695d0

-- 
View it on GitLab: https://salsa.debian.org/med-team/gjh-asl-json/-/commit/a26373b749bf2da1ca4666b11fa07c26f4f695d0
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200930/c9780715/attachment-0001.html>