You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2011/04/11 18:43:07 UTC
svn commit: r1091118 - in /commons/sandbox/runtime/trunk/src/main/native:
Makefile.unx.in configure
Author: mturk
Date: Mon Apr 11 16:43:06 2011
New Revision: 1091118
URL: http://svn.apache.org/viewvc?rev=1091118&view=rev
Log:
Initial C++ makefile support
Modified:
commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in
commons/sandbox/runtime/trunk/src/main/native/configure
Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in?rev=1091118&r1=1091117&r2=1091118&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in Mon Apr 11 16:43:06 2011
@@ -105,13 +105,18 @@ LIBSOURCES=\
$(TOPDIR)/shared/version.c \
$(TOPDIR)/shared/buildmark.c
-SHROBJECTS=$(LIBSOURCES:.c=.$(SLO)) $(ASMSOURCES:.S=.$(SLO))
+CXXSOURCES=
+
+SHROBJECTS=$(LIBSOURCES:.c=.$(SLO)) $(CXXSOURCES:.cc=.$(SLO)) $(ASMSOURCES:.S=.$(SLO))
all: prepare @sharedlib@ @modules@
%.$(SLO): %.c
$(CC) $(CCFLAGS) $(CCSHARE) $(CPPOPTS) $(CFLAGS) $(INCLUDES) -c -o $@ $<
+%.$(SLO): %.cc
+ $(CXX) $(CCFLAGS) $(CXXFLAGS) $(CCSHARE) $(CPPOPTS) $(CFLAGS) $(INCLUDES) -c -o $@ $<
+
%.$(SLO): %.S
$(CPP) $(CPPOPTS) $(ASMOPTS) $< >$@.S
$(AS) $(ASFLAGS) $(ASSHARE) -c -o $@ $@.S
@@ -140,11 +145,11 @@ prepare:
depend:
@printf "\x23 AUTOMATICALLY GENERATED BY 'make depend' -- DO NOT EDIT\n\x23\n" >$(TOPDIR)/Makedeps
- @for i in $(LIBSOURCES) @modules@ $(TSTSOURCES) ; do \
- c=`echo $$i | sed "s/.c$$//"`; \
+ @for i in $(LIBSOURCES) $(CXXSOURCES) @modules@ $(TSTSOURCES) ; do \
+ c=`echo $$i | sed "s/\.c*$$//"`; \
o=`basename $$c`; \
$(MAKEDEPS) $(CPPOPTS) $(CFLAGS) $(INCLUDES) $$i | \
- sed -e "s;$$o.$(OBJ):;$$c.\$$(DEP):;" >>$(TOPDIR)/Makedeps; \
+ sed -e "s;$$o\.$(OBJ):;$$c\.\$$(DEP):;" >>$(TOPDIR)/Makedeps; \
printf "\n" >>Makedeps; done
clean:
Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=1091118&r1=1091117&r2=1091118&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Mon Apr 11 16:43:06 2011
@@ -71,6 +71,7 @@ incdir=""
shrdir=""
bindir="bin"
cc="${CC}"
+cxx="${CXX}"
ar="${AR}"
as="${AS}"
arflags="${ARFLAGS:=ru}"
@@ -79,6 +80,7 @@ makedeps="${MAKEDEPS:=echo >/dev/null}"
topdir="${TOPDIR:=`dirname $0`}"
cpp="${CPP}"
ccflags="$CFLAGS"
+cxxopts="$CXXFLAGS"
asflags="$ASFLAGS"
ldflags="$LDFLAGS"
shflags="$SHFLAGS"
@@ -237,13 +239,15 @@ do
shift
;;
CC=*) cc="$a" ; shift ;;
+ CXX=*) cxx="$a" ; shift ;;
LD=*) ld="$a" ; shift ;;
AS=*) as="$a" ; shift ;;
AR=*) ar="$a" ; shift ;;
CPP=*) cpp="$a" ; shift ;;
RANLIB=*) ranlib="$a" ; shift ;;
- STRIP=*) strip="$a" ; shift ;;
+ STRIP=*) strip="$a" ; shift ;;
CFLAGS=*) cppopts="$a" ; shift ;;
+ CXXFLAGS=*) cxxopts="$a" ; shift ;;
LDFLAGS=*) ldflags="$a" ; shift ;;
ASFLAGS=*) asflags="$a" ; shift ;;
SHFLAGS=*) shflags="$a" ; shift ;;
@@ -409,6 +413,7 @@ fi
jvm_64_bit=no
test ".`java -version 2>&1 | grep '64-Bit'`" != . && jvm_64_bit=yes
test ".$cc" = . && cc=`getgnutool gcc`
+test ".$cxx" = . && cxx=`getgnutool g++`
test ".$ar" = . && ar=`getgnutool ar`
test ".$ranlib" = . && ranlib=`getgnutool ranlib`
test ".$strip" = . && strip=`getgnutool strip`
@@ -452,6 +457,7 @@ case "$host" in
platformver="`uname -r | sed 's/5.//'`"
host=solaris
test ".$cc_set" = .no && cc=cc
+ test ".$cxx_set" = .no && cxx=CC
;;
darwin )
platform=DARWIN
@@ -1430,6 +1436,7 @@ ARCH=$mach
BITS=$bits
EECHO=$EECHO
CC=$cc
+CXX=$cxx
CPP=$cpp
LD=$ld
SO=$so
@@ -1458,6 +1465,7 @@ CCSHARE=$ccshare
EOF
write_var CPPOPTS cppopts Makedefs
+write_var CXXOPTS cxxopts Makedefs
write_var INCLUDES includes Makedefs
cat >> $topdir/Makedefs << EOF