You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2016/12/08 00:45:55 UTC
[28/38] incubator-trafodion git commit: replace ant with make
replace ant with make
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/dfe4b564
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/dfe4b564
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/dfe4b564
Branch: refs/heads/master
Commit: dfe4b5649782770a84478a96ebf99c02cf4934ee
Parents: aba0352
Author: AlexPeng19 <al...@hotmail.com>
Authored: Tue Nov 22 14:40:51 2016 +0800
Committer: AlexPeng19 <al...@hotmail.com>
Committed: Tue Nov 22 14:40:51 2016 +0800
----------------------------------------------------------------------
core/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dfe4b564/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 5cac37d..de7e249 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -79,7 +79,7 @@ ndcs: jdbc_jar foundation
ci: trafci
trafci: jdbc_jar
- cd conn/trafci && $(ANT) dist 2>&1 | sed -e "s/$$/ ##(TRAFCI)/" ; exit $${PIPESTATUS[0]}
+ cd conn/trafci && $(MAKE) 2>&1 | sed -e "s/$$/ ##(TRAFCI)/" ; exit $${PIPESTATUS[0]}
jdbc_type2_jar: verhdr foundation
cd conn/jdbc_type2 && $(ANT) 2>&1 | sed -e "s/$$/ ##(JDBC_TYPE2)/" ; exit $${PIPESTATUS[0]}
@@ -105,7 +105,7 @@ clean: sqroot
cd dbsecurity && $(MAKE) clean
cd sqf && $(MAKE) clean
cd conn/odbc/src/odbc && $(MAKE) clean
- cd conn/trafci && $(ANT) clean
+ cd conn/trafci && $(MAKE) clean
cd conn/jdbcT4 && $(MAKE) clean
cd conn && $(MAKE) clean
cd conn/jdbc_type2 && $(ANT) clean && $(MAKE) clean
@@ -121,7 +121,7 @@ cleanall: sqroot eclipseclean cleantests
cd dbsecurity && $(MAKE) cleanall
cd sqf && $(MAKE) cleanall
cd conn/odbc/src/odbc && $(MAKE) cleanall
- cd conn/trafci && $(ANT) clean
+ cd conn/trafci && $(MAKE) clean
cd conn/jdbcT4 && $(MAKE) clean
cd conn && $(MAKE) clean
cd conn/jdbc_type2 && $(ANT) clean && $(MAKE) clean