diff options
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | catalogmgr/Makefile.am | 2 | ||||
-rw-r--r-- | clientcomm/Makefile.am | 2 | ||||
-rw-r--r-- | commline/Makefile.am | 2 | ||||
-rw-r--r-- | compression/Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | conversion/Makefile.am | 2 | ||||
l---------[-rw-r--r--] | depcomp | 590 | ||||
-rw-r--r-- | httpserver/Makefile.am | 2 | ||||
-rw-r--r-- | include/Makefile.am | 25 | ||||
-rw-r--r-- | indexmgr/Makefile.am | 2 | ||||
-rw-r--r-- | manuals_and_examples/examples/c++/Makefile | 2 | ||||
-rw-r--r-- | mddmgr/Makefile.am | 2 | ||||
-rw-r--r-- | network/Makefile.am | 2 | ||||
-rw-r--r-- | qlparser/Makefile.am | 2 | ||||
-rw-r--r-- | raslib/Makefile.am | 2 | ||||
-rw-r--r-- | rasodmg/Makefile.am | 2 | ||||
-rw-r--r-- | reladminif/Makefile.am | 2 | ||||
-rw-r--r-- | relblobif/Makefile.am | 2 | ||||
-rw-r--r-- | relcatalogif/Makefile.am | 2 | ||||
-rw-r--r-- | relindexif/Makefile.am | 2 | ||||
-rw-r--r-- | relmddif/Makefile.am | 2 | ||||
-rw-r--r-- | relstorageif/Makefile.am | 2 | ||||
-rw-r--r-- | servercomm/Makefile.am | 2 | ||||
-rw-r--r-- | storagemgr/Makefile.am | 2 | ||||
-rw-r--r-- | tilemgr/Makefile.am | 2 | ||||
-rw-r--r-- | time/Makefile.am | 2 |
28 files changed, 57 insertions, 613 deletions
@@ -18,6 +18,8 @@ clientcomm/rpcif_svc.cc clientcomm/rpcif_xdr.c config.log config.status +compile +depcomp insertutils/insertppm install-sh missing diff --git a/Makefile.am b/Makefile.am index c41c202..4a36403 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,11 +37,15 @@ CHECKLIMITS=@CHECKLIMITS@ ACLOCAL_AMFLAGS = -I m4 +nobase_include_HEADERS=raslib/*.h raslib/*.hh raslib/*.icc raslib/*.cc \ + rasodmg/*.hh rasodmg/*.cc rasodmg/*.icc conversion/*.h conversion/*.hh \ + compression/*.hh clientcomm/*.h clientcomm/*.hh + SUBDIRS = relblobif relindexif relmddif relcatalogif reladminif relstorageif \ indexmgr catalogmgr tilemgr storagemgr compression commline network \ raslib clientcomm servercomm rasodmg qlparser conversion \ mddmgr httpserver mymalloc time server rasmgr rascontrol rasdl \ - applications bin insertutils manuals_and_examples + applications bin insertutils manuals_and_examples include dist_log_DATA=empty diff --git a/catalogmgr/Makefile.am b/catalogmgr/Makefile.am index b7b8c08..c7c8c68 100644 --- a/catalogmgr/Makefile.am +++ b/catalogmgr/Makefile.am @@ -36,7 +36,7 @@ AM_CXXFLAGS= $(BASEDBCXXFLAGS) AM_LDFLAGS= $(BASEDBLDFLAGS) # object files to put in library -noinst_LIBRARIES=libcatalogmgr.a +lib_LIBRARIES=libcatalogmgr.a libcatalogmgr_a_SOURCES=ops.cc typefactory.cc algebraops.cc ops.hh \ typefactory.hh algebraops.hh autogen_ops.hh EXTRA_libcatalogmgr_a_SOURCES = autogen_ops.cc diff --git a/clientcomm/Makefile.am b/clientcomm/Makefile.am index ce87a25..dee8745 100644 --- a/clientcomm/Makefile.am +++ b/clientcomm/Makefile.am @@ -32,7 +32,7 @@ AM_CXXFLAGS = @CLIENTCXXFLAGS@ AM_LDFLAGS = @CLIENTLDFLAGS@ -noinst_LIBRARIES=libclientcomm.a +lib_LIBRARIES=libclientcomm.a libclientcomm_a_SOURCES = rpcif_clnt.cc rpcif_xdr.c rpcif.h \ clientcomm.cc clientcomm.hh rpcclientcomm.cc \ rpcclientcomm.hh clientcomm.icc \ diff --git a/commline/Makefile.am b/commline/Makefile.am index 6ff5043..2d683d0 100644 --- a/commline/Makefile.am +++ b/commline/Makefile.am @@ -27,5 +27,5 @@ # ################################################################## -noinst_LIBRARIES=libcommline.a +lib_LIBRARIES=libcommline.a libcommline_a_SOURCES=cmlparser.cc cmlparser.hh diff --git a/compression/Makefile.am b/compression/Makefile.am index 73e3c68..d6d78f8 100644 --- a/compression/Makefile.am +++ b/compression/Makefile.am @@ -31,7 +31,7 @@ AM_CXXFLAGS=@CLIENTCXXFLAGS@ AM_LDFLAGS=@CLIENTLDFLAGS@ -noinst_LIBRARIES = libcompression.a +lib_LIBRARIES = libcompression.a libcompression_a_SOURCES=nocompstream.cc nocompstream.hh tilecompression.cc \ tilecompression.hh tilecompnone.cc tilecompnone.hh \ compresstime.hh lincompstream.hh diff --git a/configure.ac b/configure.ac index a2ae640..7f5c8f3 100644 --- a/configure.ac +++ b/configure.ac @@ -129,6 +129,7 @@ AC_CONFIG_FILES([Makefile bin/Makefile manuals_and_examples/Makefile insertutils/Makefile + include/Makefile ]) # --------------- Header Template Definitions ---------------------- diff --git a/conversion/Makefile.am b/conversion/Makefile.am index 8da362d..397f69f 100644 --- a/conversion/Makefile.am +++ b/conversion/Makefile.am @@ -29,7 +29,7 @@ # ################################################################## -noinst_LIBRARIES=libconversion.a +lib_LIBRARIES=libconversion.a libconversion_a_SOURCES= convertor.cc convfactory.cc tiff.cc hdf.cc png.cc jpeg.cc \ csv.cc bmp.cc vff.cc tor.cc dem.cc ecw.cc memfs.cc \ convertor.hh convfactory.hh tiff.hh hdf.hh png.hh jpeg.hh \ @@ -1,589 +1 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2007-03-29.01 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software -# Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>. - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to <bug-automake@gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. -## Unfortunately, FreeBSD c89 acceptance of flags depends upon -## the command line argument order; so add the flags where they -## appear in depend2.am. Note that the slowdown incurred here -## affects only configure: in makefiles, %FASTDEP% shortcuts this. - for arg - do - case $arg in - -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; - *) set fnord "$@" "$arg" ;; - esac - shift # fnord - shift # $arg - done - "$@" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.u - tmpdepfile2=$base.u - tmpdepfile3=$dir.libs/$base.u - "$@" -Wc,-M - else - tmpdepfile1=$dir$base.u - tmpdepfile2=$dir$base.u - tmpdepfile3=$dir$base.u - "$@" -M - fi - stat=$? - - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp2) - # The "hp" stanza above does not work with aCC (C++) and HP's ia64 - # compilers, which have integrated preprocessors. The correct option - # to use with these is +Maked; it writes dependencies to a file named - # 'foo.d', which lands next to the object file, wherever that - # happens to be. - # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir.libs/$base.d - "$@" -Wc,+Maked - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - "$@" +Maked - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" "$tmpdepfile2" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. - "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no - for arg in "$@"; do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - "$@" || exit $? - IFS=" " - for arg - do - case "$arg" in - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: +/usr/share/automake-1.10/depcomp
\ No newline at end of file diff --git a/httpserver/Makefile.am b/httpserver/Makefile.am index 94d883b..21dad8c 100644 --- a/httpserver/Makefile.am +++ b/httpserver/Makefile.am @@ -24,7 +24,7 @@ # ################################################################## -noinst_LIBRARIES=libhttpserver.a +lib_LIBRARIES=libhttpserver.a AM_CFLAGS=$(CXXFLAGS) libhttpserver_a_SOURCES= types.h http.h server.h defs.h http-defs.h protos.h \ logging.cc signals.cc config.cc support.cc childs.cc init.cc \ diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 0000000..61042ff --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1,25 @@ +# +# This file is part of rasdaman community. +# +# Rasdaman community is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Rasdaman community is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with rasdaman community. If not, see <http://www.gnu.org/licenses/>. +# +# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Peter Baumann / +# rasdaman GmbH. +# +# For more information please see <http://www.rasdaman.org> +# or contact Peter Baumann via <baumann@rasdaman.com>. +# +################################################################### + +include_HEADERS=*.h *.hh diff --git a/indexmgr/Makefile.am b/indexmgr/Makefile.am index 01eac08..09cbf20 100644 --- a/indexmgr/Makefile.am +++ b/indexmgr/Makefile.am @@ -29,7 +29,7 @@ # ################################################################## -noinst_LIBRARIES=libindexmgr.a +lib_LIBRARIES=libindexmgr.a libindexmgr_a_SOURCES= mddobjix.cc transdirix.cc keyobject.cc srptindexlogic.cc \ sdirindexlogic.cc indexds.cc hierindexds.cc srcindexlogic.cc \ mddobjix.hh transdirix.hh keyobject.hh srptindexlogic.hh \ diff --git a/manuals_and_examples/examples/c++/Makefile b/manuals_and_examples/examples/c++/Makefile index 3a23dd1..24bdaf4 100644 --- a/manuals_and_examples/examples/c++/Makefile +++ b/manuals_and_examples/examples/c++/Makefile @@ -101,7 +101,7 @@ FMTLIBS = /usr/lib/libnetpbm.a /usr/lib/libjpeg.a /usr/local/lib/libpng.a /usr/ # libraries needed for linkage (in particular: rasdaman + exchange formats) LIBS += -L/usr/lib -L$(RMANHOME)/lib \ -lclientcomm -lrasodmg -lcompression -lconversion -lclientcomm -lrasodmg -lraslib \ - -lppm -lpgm -lnetpbm -ljpeg -lpng -ltiff -lmfhdf -ldf -lcrypto \ + -lppm -lpgm -lnetpbm -ljpeg -lpng -ltiff -lmfhdf -ldf -lcrypto -lnetwork \ -lm -lz diff --git a/mddmgr/Makefile.am b/mddmgr/Makefile.am index 5aac570..afcd4e6 100644 --- a/mddmgr/Makefile.am +++ b/mddmgr/Makefile.am @@ -30,7 +30,7 @@ AM_CXXFLAGS=@BASEDBCXXFLAGS@ -noinst_LIBRARIES= libmddmgr.a +lib_LIBRARIES= libmddmgr.a libmddmgr_a_SOURCES= mddobj.cc mddobj.hh \ mddcoll.cc mddcoll.hh \ mddcolliter.cc mddcolliter.icc mddcolliter.hh diff --git a/network/Makefile.am b/network/Makefile.am index 4f930ac..b64acaf 100644 --- a/network/Makefile.am +++ b/network/Makefile.am @@ -28,7 +28,7 @@ # ################################################################## -noinst_LIBRARIES=libnetwork.a +lib_LIBRARIES=libnetwork.a libnetwork_a_SOURCES= akgnet_commbuffer.cc akgnet_commbuffer.hh \ akgnet_file.cc akgnet_file.hh \ akgnet_nbcomm.cc akgnet_nbcomm.hh \ diff --git a/qlparser/Makefile.am b/qlparser/Makefile.am index 7638cea..577db19 100644 --- a/qlparser/Makefile.am +++ b/qlparser/Makefile.am @@ -30,7 +30,7 @@ # ################################################################## -noinst_LIBRARIES=libqlparser.a +lib_LIBRARIES=libqlparser.a # -I gnererates an interactive scanner which doesn't try to look ahead past a newline # -i generates a scanner which doesn't care about upper and lower case; doesn't work diff --git a/raslib/Makefile.am b/raslib/Makefile.am index 6760b08..c20d487 100644 --- a/raslib/Makefile.am +++ b/raslib/Makefile.am @@ -31,7 +31,7 @@ AM_CXXFLAGS=@CLIENTCXXFLAGS@ AM_LDFLAGS=@CLIENTLDFLAGS@ -noinst_LIBRARIES=libraslib.a +lib_LIBRARIES=libraslib.a libraslib_a_SOURCES= sinterval.hh dlist.hh point.hh minterval.hh error.hh \ rmdebug.hh rminit.hh metaobject.hh type.hh marraytype.hh \ basetype.hh primitivetype.hh sintervaltype.hh \ diff --git a/rasodmg/Makefile.am b/rasodmg/Makefile.am index a2da39c..d781176 100644 --- a/rasodmg/Makefile.am +++ b/rasodmg/Makefile.am @@ -31,7 +31,7 @@ AM_CXXFLAGS=@CLIENTCXXFLAGS@ AM_LDFLAGS=@CLIENTLDFLAGS@ -noinst_LIBRARIES=librasodmg.a +lib_LIBRARIES=librasodmg.a librasodmg_a_SOURCES = collection.cc collection.hh collection.icc \ set.cc set.hh \ diff --git a/reladminif/Makefile.am b/reladminif/Makefile.am index 07a6e99..8c8e712 100644 --- a/reladminif/Makefile.am +++ b/reladminif/Makefile.am @@ -38,7 +38,7 @@ AM_LDFLAGS=@BASEDBLDFLAGS@ $(EMBEDDEDSQLPRECOMPILER) $@ $< -noinst_LIBRARIES=libreladminif.a +lib_LIBRARIES=libreladminif.a libreladminif_a_SOURCES=adminifcommon.cc adminif.hh databaseifcommon.cc databaseif.hh \ transactionifcommon.cc transactionif.hh sqlerror.hh \ oidifcommon.cc oidif.hh dbobject.cc dbobject.hh \ diff --git a/relblobif/Makefile.am b/relblobif/Makefile.am index 36b7bf8..ca4b083 100644 --- a/relblobif/Makefile.am +++ b/relblobif/Makefile.am @@ -37,7 +37,7 @@ AM_LDFLAGS=@BASEDBLDFLAGS@ $(EMBEDDEDSQLPRECOMPILER) $@ $< -noinst_LIBRARIES=librelblobif.a +lib_LIBRARIES=librelblobif.a librelblobif_a_SOURCES= blobtile.hh \ dbtile.cc dbtile.hh inlinetile.cc inlinetile.hh \ blobtilecommon.cc tileid.hh diff --git a/relcatalogif/Makefile.am b/relcatalogif/Makefile.am index 19ebca8..d5492d0 100644 --- a/relcatalogif/Makefile.am +++ b/relcatalogif/Makefile.am @@ -40,7 +40,7 @@ AM_LDFLAGS=@BASEDBLDFLAGS@ .@EMBEDDEDSQLEXT@.@EMBEDDEDSQLOUT@: $(EMBEDDEDSQLPRECOMPILER) $@ $< -noinst_LIBRARIES=librelcatalogif.a +lib_LIBRARIES=librelcatalogif.a librelcatalogif_a_SOURCES= type.C type.hh basetype.C basetype.hh atomictype.C ulongtype.C ulongtype.hh ushorttype.C ushorttype.hh \ booltype.C booltype.hh compositetype.C compositetype.hh structtypecommon.cc structtype.hh structtype.icc \ longtype.C longtype.hh shorttype.C shorttype.hh octettype.C octettype.hh doubletype.C doubletype.hh\ diff --git a/relindexif/Makefile.am b/relindexif/Makefile.am index d7ab48d..c7d2069 100644 --- a/relindexif/Makefile.am +++ b/relindexif/Makefile.am @@ -33,7 +33,7 @@ AM_LDFLAGS=@BASEDBLDFLAGS@ .@EMBEDDEDSQLEXT@.@EMBEDDEDSQLOUT@: $(EMBEDDEDSQLPRECOMPILER) $@ $< -noinst_LIBRARIES=librelindexif.a +lib_LIBRARIES=librelindexif.a librelindexif_a_SOURCES=dbrcindexdscommon.cc dbrcindexds.hh \ dbtcindexcommon.cc dbtcindex.hh \ hierindexcommon.cc hierindex.hh \ diff --git a/relmddif/Makefile.am b/relmddif/Makefile.am index d225fc4..986a827 100644 --- a/relmddif/Makefile.am +++ b/relmddif/Makefile.am @@ -36,7 +36,7 @@ AM_LDFLAGS=@BASEDBLDFLAGS@ .@EMBEDDEDSQLEXT@.@EMBEDDEDSQLOUT@: $(EMBEDDEDSQLPRECOMPILER) $@ $< -noinst_LIBRARIES=librelmddif.a +lib_LIBRARIES=librelmddif.a librelmddif_a_SOURCES=dbmddsetcommon.cc dbmddobj.hh dbmddset.hh dbiterid.hh mddid.hh EXTRA_librelmddif_a_SOURCES= dbmddobj.pgc dbmddset.pgc librelmddif_a_LIBADD=dbmddobj.$(OBJEXT) dbmddset.$(OBJEXT) diff --git a/relstorageif/Makefile.am b/relstorageif/Makefile.am index 0ed7565..ba5b739 100644 --- a/relstorageif/Makefile.am +++ b/relstorageif/Makefile.am @@ -36,7 +36,7 @@ AM_LDFLAGS=@BASEDBLDFLAGS@ $(EMBEDDEDSQLPRECOMPILER) $@ $< -noinst_LIBRARIES=librelstorageif.a +lib_LIBRARIES=librelstorageif.a librelstorageif_a_SOURCES= dbstoragelayout.hh storageid.hh empty.cc EXTRA_librelstorageif_a_SOURCES= dbstoragelayout.pgc librelstorageif_a_LIBADD= dbstoragelayout.$(OBJEXT) diff --git a/servercomm/Makefile.am b/servercomm/Makefile.am index 5c18776..7e0c1a8 100644 --- a/servercomm/Makefile.am +++ b/servercomm/Makefile.am @@ -31,7 +31,7 @@ AM_CXXFLAGS=@BASEDBCXXFLAGS@ AM_LDFLAGS=@BASEDBLDFLAGS@ -noinst_LIBRARIES=libservercomm.a +lib_LIBRARIES=libservercomm.a libservercomm_a_SOURCES=../clientcomm/rpcif_xdr.c ../clientcomm/rpcif_svc.cc servercomm.cc \ servercomm2.cc manager.cc callbackmgr.cc httpserver.cc \ ../mymalloc/mymalloc_svc.cc ../mymalloc/mymalloc.h \ diff --git a/storagemgr/Makefile.am b/storagemgr/Makefile.am index 60e93bd..f019320 100644 --- a/storagemgr/Makefile.am +++ b/storagemgr/Makefile.am @@ -28,7 +28,7 @@ # ################################################################## -noinst_LIBRARIES = libstoragemgr.a +lib_LIBRARIES = libstoragemgr.a libstoragemgr_a_SOURCES = sstoragelayout.cc sstoragelayout.hh CLEANFILES= core client.bm client.dbg client.log ir.out diff --git a/tilemgr/Makefile.am b/tilemgr/Makefile.am index 676d354..53481df 100644 --- a/tilemgr/Makefile.am +++ b/tilemgr/Makefile.am @@ -29,5 +29,5 @@ # ################################################################## -noinst_LIBRARIES = libtilemgr.a +lib_LIBRARIES = libtilemgr.a libtilemgr_a_SOURCES = tile.cc tile.hh tile.icc tiler.cc tiler.hh diff --git a/time/Makefile.am b/time/Makefile.am index edb58f6..f4faa22 100644 --- a/time/Makefile.am +++ b/time/Makefile.am @@ -27,5 +27,5 @@ # ################################################################## -noinst_LIBRARIES=libtime.a +lib_LIBRARIES=libtime.a libtime_a_SOURCES= akg_localtime.cc akg_benchmark.cc akgtime.hh |