default.aap diff
Adriaan de Groot <adridg-FlD2LfDziEhmR6Xm/[email protected]>
| Newsgroups | gmane.comp.tools.aap.devel |
|---|---|
| Message-ID | <[email protected]> |
this diff removes all the lt related stuff from default.aap. It also (see the lines that affect EEE) allows you to set EEE to influence deendency generation by gcc (something I needed for the qt module). if :ltlib doesn't automatically :import the libtool module, we should add that as soon as the name of the module is settled. -- pub 1024D/FEA2A3FE 2002-06-18 Adriaan de Groot <[email protected]> If the door is ajar, can we fill it with door-jamb?
default.diff
(text/x-diff, 4.3 KB)
Index: default.aap
===================================================================
RCS file: /cvsroot/a-a-p/Exec/default.aap,v
retrieving revision 1.53
diff -u -3 -p -r1.53 default.aap
--- default.aap 30 Sep 2003 17:41:35 -0000 1.53
+++ default.aap 30 Sep 2003 21:29:20 -0000
@@ -66,10 +66,6 @@ CXX ?= $CC
DLLOBJSUF = .o
CXXFLAGS = $CXXFLAGS -LANG:std
-# for libtool
-LTOBJSUF = .lo
-LTLIBPRE = lib
-LTLIBSUF = .la
# Check if $CC ($CXX) is GCC, remember this in $HASGCC ($HASGCCXX)
# Use a dependency to avoid checking it more than once.
@@ -146,9 +142,9 @@ gcccheckxx {virtual} :
# files but "-E" is required for ".h" files...
ss = $-source
@if fname_fold(suffix(ss)) in ['h', 'H', 'hh', 'hpp', 'hxx']:
- EEE = -E
+ EEE += -E
@else:
- EEE =
+ EEE +=
:sysdepend {filepat = .*: ([^:]*): No such file or directory}
$cc $CPPFLAGS $?DEFINE $?INCLUDE $flags $EEE -MM
$-source > $-target
@@ -284,40 +280,6 @@ DLLCXXFLAGS ?= -fPIC
$($)?DEFINE $($)?INCLUDE $($)CXXFLAGS $($)DLLCXXFLAGS} %.cpp
:do compile {target = $target} $source
-# "libobject" is handled as default: "object"
-
-LIBTOOL ?= libtool --silent
-
-:action compile ltobject c
- @if not _no.get("target"):
- target = `src2obj(fname)`
- act = $?C_COMPILE_ACTION
- @if not act:
- act = $?COMPILE_ACTION # be backwards compatible
- @if act:
- :do $act {target = $target} $source
- @else:
- :buildcheck $OPTIMIZE $?DEBUG
- :sys $LIBTOOL --mode=compile --tag=C
- $CC $CPPFLAGS $?DEFINE $?INCLUDE `cflags_normal()` $CFLAGS
- -c -o $target $source
-
-:action compile ltobject cpp
- @if not _no.get("target"):
- target = `src2obj(fname)`
- :attr {buildaction = cxx_build} $target # Need to build with $CXX
- act = $?CXX_COMPILE_ACTION
- @if not act:
- act = $?COMPILE_ACTION # be backwards compatible
- @if act:
- :do $act {target = $target} $source
- @else:
- :buildcheck $OPTIMIZE $?DEBUG
- :sys $LIBTOOL --mode=compile --tag=CXX
- $CXX $CPPFLAGS $?DEFINE $?INCLUDE `cflags_normal()` $CXXFLAGS
- -c -o $target $source
-
-
# :do preproc
:action preproc default c,cpp
@@ -419,10 +381,7 @@ YACCPP ?=
ld = $CC
:buildcheck $OPTIMIZE $?DEBUG
@if _no.get("LTLIBS"):
- # $LTLIBS is set, use libtool for linking
- :sys $LIBTOOL --mode=link --tag=C
- $ld $LDFLAGS `cflags_normal()` -o $target $source
- $?LTLIBS $?LIBS
+ :do ltbuild { target = $target } $source
@else:
:sys $ld $LDFLAGS `cflags_normal()` -o $target $source $?LIBS
@@ -438,10 +397,7 @@ YACCPP ?=
ld = $CXX
:buildcheck $OPTIMIZE $?DEBUG
@if _no.get("LTLIBS"):
- # $LTLIBS is set, use libtool for linking
- :sys $LIBTOOL --mode=link --tag=CXX
- $ld $LDFLAGS `cflags_normal()` -o $target $source
- $?LTLIBS $?LIBS
+ :do ltbuild_cxx { target = $target } $source
@else:
:sys $ld $LDFLAGS `cflags_normal()` -o $target $source $?LIBS
@@ -520,27 +476,6 @@ YACCPP ?=
:sys $SHLINK $LDFLAGS $SHLINKFLAGS -o $target $source
-# :do buildltlib
-
-:action buildltlib default
- ld = $?LD
- # No linker specified by the user.
- # If one of the objects was compiled with $CXX, we need to use the
- # same for the linker (unless the user specified $LD explicitly).
- @if not ld:
- ld = $CC
- tag = C
- @for item in var2dictlist(source):
- @if item.get("buildaction") == "cxx_build":
- @if not ld:
- ld = $CXX
- tag = CXX
- @break
- :buildcheck $OPTIMIZE $?DEBUG
- :sys $LIBTOOL --mode=link --tag=$tag
- $ld $LDFLAGS `cflags_normal()` -o $target $source
-
-
# :do email
MAILER = `os.environ.get('MAILER', 'mail')`
@@ -626,22 +561,6 @@ DLLMODE ?= 0755
:action uninstalldll default
dest = $DLLDIR
@uninstall_files(dest, source)
-
-# :do installtlib
-:action installltlib default
- @for i in var2dictlist(source):
- destltlib = $DESTDIR/$PREFIX/$DLLDIR
- @if i.has_key("installdir"):
- @destltlib += "/" + i["installdir"] + "/"
- @destltlib = os.path.abspath(destltlib)
- @try:
- @os.makedirs(destltlib)
- @except OSError:
- :print $destltlib already exists
- @destltlib = destltlib + "/" + i["name"]
- @destltlib = os.path.abspath(destltlib)
- :sys $libtool --mode=install /usr/bin/install `i["name"]` $destltlib
-
# :do installconf/uninstallconf
CONFDIR ?= etc/