summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2016-12-22 18:31:20 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2016-12-22 18:31:20 (GMT)
commit0f0773f937f1ad525a19eb1efbaaef2b3aba1073 (patch)
tree22c8801bc13569b19130c86ed2fd1b54c1a4d1d3
parent9f3bd0f08b42a82c3b7cdbe0b954923232ad4254 (diff)
downloadblt-0f0773f937f1ad525a19eb1efbaaef2b3aba1073.zip
blt-0f0773f937f1ad525a19eb1efbaaef2b3aba1073.tar.gz
blt-0f0773f937f1ad525a19eb1efbaaef2b3aba1073.tar.bz2
undo
-rw-r--r--make.include33
1 files changed, 26 insertions, 7 deletions
diff --git a/make.include b/make.include
index f62e429..7c9ea59 100644
--- a/make.include
+++ b/make.include
@@ -264,7 +264,7 @@ tksao/Makefile :
#-------------------------- ast
-ast : ast/Makefile ast_includes ast_libs
+ast : ast/Makefile ast/ast.h ast/.libs/libast.a ast/.libs/libast_err.a ast/.libs/libast_pal.a
ast/Makefile :
@echo ""
@@ -278,19 +278,38 @@ ast/Makefile :
--prefix $(ROOT) --exec-prefix $(ROOT) \
--disable-shared
-ast_includes :
+ast/ast.h :
@echo ""
- @echo "*** Install ast includes ***"
+ @echo "*** Install ast/ast.h ***"
+ $(MAKE) -C ast -j ast.h
+ $(MAKE) -C ast -j $(JOBS) libast.la
+ $(MAKE) -C ast -j $(JOBS) libast_err.la
+ $(MAKE) -C ast -j $(JOBS) libast_pal.la
cp ast/ast.h $(ROOT)/include/.
cp ast/grf.h $(ROOT)/include/.
cp ast/grf3d.h $(ROOT)/include/.
+ cp ast/.libs/libast.a $(ROOT)/lib/.
+ cp ast/.libs/libast_err.a $(ROOT)/lib/.
+ cp ast/.libs/libast_pal.a $(ROOT)/lib/.
-ast_libs :
- $(MAKE) -C ast -j $(JOBS) libast.la
+ast/.libs/libast.a :
+ @echo ""
+ @echo "*** Install ast/ast.h ***"
+ $(MAKE) -C ast -j ast.h
+ cp ast/ast.h $(ROOT)/include/.
+ cp ast/grf.h $(ROOT)/include/.
+ cp ast/grf3d.h $(ROOT)/include/.
+
+ast/.libs/libast_err.a :
+ @echo ""
+ @echo "*** Install ast/libast_err.a ***"
$(MAKE) -C ast -j $(JOBS) libast_err.la
- $(MAKE) -C ast -j $(JOBS) libast_pal.la
- cp ast/.libs/libast_err.a $(ROOT)/lib/.
cp ast/.libs/libast_err.a $(ROOT)/lib/.
+
+ast/.libs/libast_pal.a :
+ @echo ""
+ @echo "*** Install ast/libast_pal.a ***"
+ $(MAKE) -C ast -j $(JOBS) libast_pal.la
cp ast/.libs/libast_pal.a $(ROOT)/lib/.
#-------------------------- funtools