You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/03/09 01:48:36 UTC
[33/50] git commit: TS-1733 Minor fixes.
TS-1733 Minor fixes.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7016ec95
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7016ec95
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7016ec95
Branch: refs/heads/3.3.x
Commit: 7016ec95807cdef0e1d3feac38038f533a581624
Parents: 1944efa
Author: Phil Sorber <so...@apache.org>
Authored: Mon Mar 4 15:18:16 2013 -0500
Committer: Phil Sorber <so...@apache.org>
Committed: Mon Mar 4 16:24:57 2013 -0500
----------------------------------------------------------------------
plugins/experimental/channel_stats/Makefile.tsxs | 2 +-
tools/tsxs.in | 14 +++++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7016ec95/plugins/experimental/channel_stats/Makefile.tsxs
----------------------------------------------------------------------
diff --git a/plugins/experimental/channel_stats/Makefile.tsxs b/plugins/experimental/channel_stats/Makefile.tsxs
index 405affc..20217a1 100644
--- a/plugins/experimental/channel_stats/Makefile.tsxs
+++ b/plugins/experimental/channel_stats/Makefile.tsxs
@@ -17,7 +17,7 @@
TSXS?=tsxs
%.so: %.cc
- $(TSXS) -o $@ %<
+ $(TSXS) -o $@ $<
all: channel_stats.so
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7016ec95/tools/tsxs.in
----------------------------------------------------------------------
diff --git a/tools/tsxs.in b/tools/tsxs.in
index b0b1534..d4165e0 100755
--- a/tools/tsxs.in
+++ b/tools/tsxs.in
@@ -69,11 +69,11 @@ compile() {
SRC=$1
extension=`echo $SRC | sed -e 's/^.*\.//g'`
case $extension in
- c)
+ c|C)
MY_CFLAGS="$CPPFLAGS $CFLAGS"
MY_CC=$CC
;;
- cpp|cxx|CPP|CXX|CC|C)
+ cpp|cxx|cc|CPP|CXX|CC)
MY_CFLAGS="$CPPFLAGS $CXXFLAGS"
MY_CC=$CXX
;;
@@ -138,6 +138,8 @@ case $host in
;;
esac
+files=()
+
LD=$MODULELD
while getopts "hivl:L:I:c:C:o:" OPTION
do
@@ -164,11 +166,17 @@ do
i)
INSTALL=1
;;
+ c)
+ files[${#files[@]}]="$OPTARG"
+ ;;
+ C)
+ files[${#files[@]}]="$OPTARG"
+ ;;
esac
done
shift $(( OPTIND - 1))
-for file in "$@"; do
+for file in "${files[@]}" "$@"; do
compile $file
done