From 1eae25d17af6d473a398e5581f2ab7f0160b9adf Mon Sep 17 00:00:00 2001 From: PSadrozinski Date: Sun, 25 Dec 2011 18:38:27 -0500 Subject: [PATCH] removing automake files - just updating cmake build files from now --- Makefile.am | 11 - acinclude.m4 | 394 -------- am2dsp.pl | 1257 ------------------------ autogen.sh | 52 - configure.ac | 486 --------- src/Airports/GenAirports/Makefile.am | 64 -- src/Airports/Makefile.am | 7 - src/Airspace/Makefile.am | 5 - src/BuildTiles/Clipper/Makefile.am | 20 - src/BuildTiles/GenOutput/Makefile.am | 8 - src/BuildTiles/Main/Makefile.am | 36 - src/BuildTiles/Makefile.am | 9 - src/BuildTiles/Match/Makefile.am | 5 - src/BuildTiles/Osgb36/Makefile.am | 11 - src/BuildTiles/Parallel/Makefile.am | 16 - src/BuildTiles/Triangulate/Makefile.am | 7 - src/Include/Makefile.am | 0 src/Lib/Array/Makefile.am | 13 - src/Lib/DEM/Makefile.am | 6 - src/Lib/Geometry/Makefile.am | 15 - src/Lib/HGT/Makefile.am | 12 - src/Lib/Makefile.am | 16 - src/Lib/Optimize/Makefile.am | 7 - src/Lib/Output/Makefile.am | 6 - src/Lib/Polygon/Makefile.am | 11 - src/Lib/TriangleJRS/Makefile.am | 37 - src/Lib/e00/Makefile.am | 12 - src/Lib/landcover/Makefile.am | 10 - src/Lib/poly2tri/Makefile.am | 15 - src/Lib/shapelib/Makefile.am | 37 - src/Lib/vpf/Makefile.am | 49 - src/Makefile.am | 7 - src/Prep/DemChop/Makefile.am | 82 -- src/Prep/DemInfo/Makefile.am | 44 - src/Prep/DemRaw2ascii/Makefile.am | 31 - src/Prep/E00Lines/Makefile.am | 15 - src/Prep/GDALChop/Makefile.am | 38 - src/Prep/GSHHS/Makefile.am | 26 - src/Prep/Makefile.am | 22 - src/Prep/MergerClipper/Makefile.am | 18 - src/Prep/OGRDecode/Makefile.am | 16 - src/Prep/Photo/Makefile.am | 55 -- src/Prep/ShapeFile/Makefile.am | 17 - src/Prep/TGVPF/Makefile.am | 15 - src/Prep/Terra/Makefile.am | 28 - src/Prep/TerraFit/Makefile.am | 15 - src/Prep/Tower/Makefile.am | 1 - src/Prep/UserDef/Makefile.am | 16 - src/Utils/Makefile.am | 10 - src/Utils/cdrom/Makefile.am | 6 - src/Utils/download-map/Makefile.am | 1 - src/Utils/poly2ogr/Makefile.am | 10 - 52 files changed, 3107 deletions(-) delete mode 100644 Makefile.am delete mode 100644 acinclude.m4 delete mode 100755 am2dsp.pl delete mode 100755 autogen.sh delete mode 100644 configure.ac delete mode 100644 src/Airports/GenAirports/Makefile.am delete mode 100644 src/Airports/Makefile.am delete mode 100644 src/Airspace/Makefile.am delete mode 100644 src/BuildTiles/Clipper/Makefile.am delete mode 100644 src/BuildTiles/GenOutput/Makefile.am delete mode 100644 src/BuildTiles/Main/Makefile.am delete mode 100644 src/BuildTiles/Makefile.am delete mode 100644 src/BuildTiles/Match/Makefile.am delete mode 100644 src/BuildTiles/Osgb36/Makefile.am delete mode 100644 src/BuildTiles/Parallel/Makefile.am delete mode 100644 src/BuildTiles/Triangulate/Makefile.am delete mode 100644 src/Include/Makefile.am delete mode 100644 src/Lib/Array/Makefile.am delete mode 100644 src/Lib/DEM/Makefile.am delete mode 100644 src/Lib/Geometry/Makefile.am delete mode 100644 src/Lib/HGT/Makefile.am delete mode 100644 src/Lib/Makefile.am delete mode 100644 src/Lib/Optimize/Makefile.am delete mode 100644 src/Lib/Output/Makefile.am delete mode 100644 src/Lib/Polygon/Makefile.am delete mode 100644 src/Lib/TriangleJRS/Makefile.am delete mode 100644 src/Lib/e00/Makefile.am delete mode 100644 src/Lib/landcover/Makefile.am delete mode 100644 src/Lib/poly2tri/Makefile.am delete mode 100644 src/Lib/shapelib/Makefile.am delete mode 100644 src/Lib/vpf/Makefile.am delete mode 100644 src/Makefile.am delete mode 100644 src/Prep/DemChop/Makefile.am delete mode 100644 src/Prep/DemInfo/Makefile.am delete mode 100644 src/Prep/DemRaw2ascii/Makefile.am delete mode 100644 src/Prep/E00Lines/Makefile.am delete mode 100644 src/Prep/GDALChop/Makefile.am delete mode 100644 src/Prep/GSHHS/Makefile.am delete mode 100644 src/Prep/Makefile.am delete mode 100644 src/Prep/MergerClipper/Makefile.am delete mode 100644 src/Prep/OGRDecode/Makefile.am delete mode 100644 src/Prep/Photo/Makefile.am delete mode 100644 src/Prep/ShapeFile/Makefile.am delete mode 100644 src/Prep/TGVPF/Makefile.am delete mode 100644 src/Prep/Terra/Makefile.am delete mode 100644 src/Prep/TerraFit/Makefile.am delete mode 100644 src/Prep/Tower/Makefile.am delete mode 100644 src/Prep/UserDef/Makefile.am delete mode 100644 src/Utils/Makefile.am delete mode 100644 src/Utils/cdrom/Makefile.am delete mode 100644 src/Utils/download-map/Makefile.am delete mode 100644 src/Utils/poly2ogr/Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 5c449d69..00000000 --- a/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -EXTRA_DIST = \ - README README README.cygwin README.gpc README.gts README.howto \ - README.SimGear \ - TerraGear.dsp TerraGear.dsw - acinclude.m4 \ - autogen.sh - -SUBDIRS = src - -dist-hook: - (cd $(top_srcdir); ./am2dsp.pl) diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index cca66ce8..00000000 --- a/acinclude.m4 +++ /dev/null @@ -1,394 +0,0 @@ -dnl -dnl originally from ncftp 2.3.0 -dnl added wi_EXTRA_PDIR and wi_ANSI_C -dnl $Id: acinclude.m4,v 1.3 2005-09-09 14:49:19 curt Exp $ -dnl -AC_DEFUN([wi_EXTRA_IDIR], [ -incdir="$1" -if test -r $incdir ; then - case "$CPPFLAGS" in - *-I${incdir}*) - # echo " + already had $incdir" 1>&6 - ;; - *) - if test "$CPPFLAGS" = "" ; then - CPPFLAGS="-I$incdir" - else - CPPFLAGS="$CPPFLAGS -I$incdir" - fi - echo " + found $incdir" 1>&6 - ;; - esac -fi -]) -dnl -dnl -dnl -dnl -AC_DEFUN([wi_EXTRA_LDIR], [ -mylibdir="$1" -if test -r $mylibdir ; then - case "$LDFLAGS" in - *-L${mylibdir}*) - # echo " + already had $mylibdir" 1>&6 - ;; - *) - if test "$LDFLAGS" = "" ; then - LDFLAGS="-L$mylibdir" - else - LDFLAGS="$LDFLAGS -L$mylibdir" - fi - echo " + found $mylibdir" 1>&6 - ;; - esac -fi -]) -dnl -dnl __FP__ -dnl -dnl -AC_DEFUN([wi_EXTRA_PDIR], [ -progdir="$1" -if test -r $progdir ; then - case "$PATH" in - *:${progdir}*) - # echo " + already had $progdir" 1>&6 - ;; - *${progdir}:*) - # echo " + already had $progdir" 1>&6 - ;; - *) - if test "$PATH" = "" ; then - PATH="$progdir" - else - PATH="$PATH:$progdir" - fi - echo " + found $progdir" 1>&6 - ;; - esac -fi -]) -dnl -dnl -dnl If you want to also look for include and lib subdirectories in the -dnl $HOME tree, you supply "yes" as the first argument to this macro. -dnl -dnl If you want to look for subdirectories in include/lib directories, -dnl you pass the names in argument 3, otherwise pass a dash. -dnl -AC_DEFUN([wi_EXTRA_DIRS], [echo "checking for extra include and lib directories..." 1>&6 -ifelse([$1], yes, [dnl -b1=`cd .. ; pwd` -b2=`cd ../.. ; pwd` -exdirs="$HOME $j $b1 $b2 $prefix $2" -],[dnl -exdirs="$prefix $2" -]) -subexdirs="$3" -if test "$subexdirs" = "" ; then - subexdirs="-" -fi -for subexdir in $subexdirs ; do -if test "$subexdir" = "-" ; then - subexdir="" -else - subexdir="/$subexdir" -fi -for exdir in $exdirs ; do - if test "$exdir" != "/usr" || test "$subexdir" != ""; then - incdir="${exdir}/include${subexdir}" - wi_EXTRA_IDIR($incdir) - - mylibdir="${exdir}/lib${subexdir}" - wi_EXTRA_LDIR($mylibdir) - - progdir="${exdir}/bin${subexdir}" - wi_EXTRA_PDIR($progdir) - fi -done -done -]) -dnl -dnl -dnl -AC_DEFUN([wi_HPUX_CFLAGS], -[AC_MSG_CHECKING(if HP-UX ansi C compiler flags are needed) -AC_REQUIRE([AC_PROG_CC]) -os=`uname -s | tr '[A-Z]' '[a-z]'` -ac_cv_hpux_flags=no -if test "$os" = hp-ux ; then - if test "$ac_cv_prog_gcc" = yes ; then - if test "$CFLAGS" != "" ; then - # Shouldn't be in there. - CFLAGS=`echo "$CFLAGS" | sed 's/-Aa//g'` - fi - else - # If you're not using gcc, then you better have a cc/c89 - # that is usable. If you have the barebones compiler, it - # won't work. The good compiler uses -Aa for the ANSI - # compatible stuff. - x=`echo $CFLAGS | grep 'Aa' 2>/dev/null` - if test "$x" = "" ; then - CFLAGS="$CFLAGS -Aa" - fi - ac_cv_hpux_flags=yes - fi - # Also add _HPUX_SOURCE to get the extended namespace. - x=`echo $CFLAGS | grep '_HPUX_SOURCE' 2>/dev/null` - if test "$x" = "" ; then - CFLAGS="$CFLAGS -D_HPUX_SOURCE" - fi -fi -AC_MSG_RESULT($ac_cv_hpux_flags) -]) -dnl -dnl -dnl -AC_DEFUN([wi_CFLAGS], [AC_REQUIRE([AC_PROG_CC]) -wi_HPUX_CFLAGS - if test "$CFLAGS" = "" ; then - CFLAGS="-O" - elif test "$ac_cv_prog_gcc" = "yes" ; then - case "$CFLAGS" in - *"-g -O"*) - #echo "using -g as default gcc CFLAGS" 1>&6 - CFLAGS=`echo $CFLAGS | sed 's/-g\ -O/-O/'` - ;; - *"-O -g"*) - # Leave the -g, but remove all -O options. - #echo "using -g as default gcc CFLAGS" 1>&6 - CFLAGS=`echo $CFLAGS | sed 's/-O\ -g/-O/'` - ;; - esac - fi -]) -dnl -dnl -dnl -AC_DEFUN([wi_PROTOTYPES], [ -AC_MSG_CHECKING(if the compiler supports function prototypes) -AC_TRY_COMPILE(,[extern void exit(int status);],[wi_cv_prototypes=yes -AC_DEFINE(PROTOTYPES)],wi_cv_prototypes=no) -AC_MSG_RESULT($wi_cv_prototypes) -]) -dnl -dnl -dnl -AC_DEFUN([wi_ANSI_C], [ -AC_MSG_CHECKING(ANSI-style function definitions) -AC_TRY_COMPILE(,[int blubb(int x) { return 0; }],[wi_cv_ansi_funcs=yes -AC_DEFINE(ANSI_FUNCS)],wi_cv_ansi_funcs=no) -AC_MSG_RESULT($wi_cv_ansi_funcs) -]) -dnl -dnl -dnl -AC_DEFUN([wi_HEADER_SYS_SELECT_H], [ -# See if is includable after -if test "$ac_cv_header_sys_time_h" = no ; then -AC_CHECK_HEADERS(sys/time.h sys/select.h) -else -AC_CHECK_HEADERS(sys/select.h) -fi -if test "$ac_cv_header_sys_select_h" = yes ; then - AC_MSG_CHECKING([if is compatible with ]) - selecth=yes - if test "$ac_cv_header_sys_time_h" = yes ; then - AC_TRY_COMPILE([#include - #include ],[ - fd_set a; - struct timeval tmval; - - tmval.tv_sec = 0;],selecth=yes,selecth=no) - - if test "$selecth" = yes ; then - AC_DEFINE(CAN_USE_SYS_SELECT_H) - fi - fi - AC_MSG_RESULT($selecth) -fi -]) -dnl -dnl -dnl -AC_DEFUN([wi_LIB_RESOLV], [ -# See if we could access two well-known sites without help of any special -# libraries, like resolv. - -AC_TRY_RUN([ -#include -#include -#include -#include - -main() -{ - struct hostent *hp1, *hp2; - int result; - - hp1 = gethostbyname("gatekeeper.dec.com"); - hp2 = gethostbyname("ftp.ncsa.uiuc.edu"); - result = ((hp1 != (struct hostent *) 0) && (hp2 != (struct hostent *) 0)); - exit(! result); -}],look_for_resolv=no,look_for_resolv=yes,look_for_resolv=yes) - -AC_MSG_CHECKING([if we need to look for -lresolv]) -AC_MSG_RESULT($look_for_resolv) -if test "$look_for_resolv" = yes ; then -AC_CHECK_LIB(resolv,main) -else - ac_cv_lib_resolv=no -fi -]) -dnl -dnl -dnl - -AC_DEFUN([wi_LIB_NSL], [ -AC_MSG_CHECKING(if we can use -lnsl) -ac_save_LIBS="$LIBS"; -LIBS="$LIBS -lnsl"; -AC_CACHE_VAL(r_cv_use_libnsl, [ -AC_TRY_RUN( -main() { if (getpwuid(getuid())) exit(0); exit(-1); }, -nc_cv_use_libnsl=yes, nc_cv_use_libnsl=no, nc_cv_use_libnsl=no) -]) -if test "$nc_cv_use_libnsl" = "no"; then LIBS="$ac_save_LIBS"; fi -AC_MSG_RESULT($nc_cv_use_libnsl) -])dnl - -dnl -dnl -dnl - -AC_DEFUN([nc_PATH_PROG_ZCAT], [ -AC_PATH_PROG(GZCAT,gzcat) -AC_PATH_PROG(ZCAT,zcat) -if test "x$GZCAT" = x ; then - if test "x$ZCAT" != x ; then - # See if zcat is really gzcat. gzcat has a --version option, regular - # zcat does not. - AC_MSG_CHECKING(if zcat is really gzcat in disguise) - if $ZCAT --version 2> /dev/null ; then - AC_DEFINE_UNQUOTED(GZCAT, "$ZCAT") - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - fi -else - AC_DEFINE_UNQUOTED(GZCAT, "$GZCAT") -fi - -if test "x$ZCAT" != x ; then - AC_DEFINE_UNQUOTED(ZCAT, "$ZCAT") -fi -]) -dnl -dnl -dnl -AC_DEFUN([wi_SYSV_EXTRA_DIRS], [ -# Use System V because their curses extensions are required. This must -# be done early so we use the -I and -L in the library checks also. -# This is mostly a Solaris/SunOS hack. Note that doing this will also -# use all of the other System V libraries and headers. - -AC_MSG_CHECKING(for alternative System V libraries) -if test -f /usr/5include/curses.h ; then - CPPFLAGS="$CPPFLAGS -I/usr/5include" - LDFLAGS="$LDFLAGS -L/usr/5lib" - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -]) -dnl -dnl -dnl -AC_DEFUN([wi_DEFINE_UNAME], [ -# Get first 127 chars of all uname information. Some folks have -# way too much stuff there, so grab only the first 127. -unam=`uname -a 2>/dev/null | cut -c1-127` -if test "$unam" != "" ; then - AC_DEFINE_UNQUOTED(UNAME, "$unam") -fi -]) -dnl -dnl -dnl -AC_DEFUN([wi_READLINE_WITH_NCURSES], [ -# Readline and Ncurses could both define "backspace". -# Warn about this if we have both things in our definitions list. - -if test "$ac_cv_lib_readline" = yes && test "$ac_cv_lib_ncurses" = yes ; then - -AC_MSG_CHECKING(if readline and ncurses will link together) -j="$LIBS" -LIBS="-lreadline -lncurses" -AC_TRY_LINK(,[ -readline("prompt"); -endwin(); -],k=yes,k=no) -if test "$k" = no ; then - AC_MSG_RESULT(no) - # Remove '-lreadline' from LIBS. - LIBS=`echo $j | sed s/-lreadline//g` - ac_cv_lib_readline=no - AC_WARN([The versions of GNU readline and ncurses you have installed on this system -can't be used together, because they use the same symbol, backspace. If -possible, recompile one of the libraries with -Dbackspace=back_space, then -re-run configure.]) - -else - AC_MSG_RESULT(yes) - LIBS="$j" -fi - -fi -]) -dnl -dnl -dnl - -dnl AC_EXT_DAYLIGHT -dnl Check for an external variable daylight. Stolen from w3c-libwww. -AC_DEFUN([AC_EXT_DAYLIGHT], -[ AC_MSG_CHECKING(int daylight variable) -AC_TRY_COMPILE([#include ], [return daylight;], - have_daylight=yes, - have_daylight=no) -AC_MSG_RESULT($have_daylight) -])dnl - -dnl AC_EXT_TIMEZONE -dnl Check for an external variable timezone. Stolen from tcl-8.0. -AC_DEFUN([AC_EXT_TIMEZONE], -[ -# -# Its important to include time.h in this check, as some systems (like convex) -# have timezone functions, etc. -# -have_timezone=no -AC_MSG_CHECKING([long timezone variable]) -AC_TRY_COMPILE([#include ], - [extern long timezone; - timezone += 1; - exit (0);], - [have_timezone=yes - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no)) - -# -# On some systems (eg IRIX 6.2), timezone is a time_t and not a long. -# -if test "$have_timezone" = no; then - AC_MSG_CHECKING([time_t timezone variable]) - AC_TRY_COMPILE([#include ], - [extern time_t timezone; - timezone += 1; - exit (0);], - [have_timezone=yes - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no)) -fi -])dnl diff --git a/am2dsp.pl b/am2dsp.pl deleted file mode 100755 index 30d0a757..00000000 --- a/am2dsp.pl +++ /dev/null @@ -1,1257 +0,0 @@ -#!/usr/bin/perl -w - -eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' - if 0; - -use strict; -use Cwd; - -my $VERSION = "0.1"; -my $PACKAGE = "am2dsp"; - -# String constants. -my $IGNORE_PATTERN = "^##([^#].*)?\$"; -my $WHITE_PATTERN = "^[ \t]*\$"; -my $COMMENT_PATTERN = "^#"; -my $RULE_PATTERN = "^([\$a-zA-Z_.][-.a-zA-Z0-9_(){}/\$]*) *:([^=].*|)\$"; -my $SUFFIX_RULE_PATTERN = "^\\.([a-zA-Z]+)\\.([a-zA-Z]+)\$"; -my $MACRO_PATTERN = "^([A-Za-z][A-Za-z0-9_]*)[ \t]*([:+]?)=[ \t]*(.*)\$"; -my $BOGUS_MACRO_PATTERN = "^([^ \t]*)[ \t]*([:+]?)=[ \t]*(.*)\$"; -my $IF_PATTERN = "^if[ \t]+\([A-Za-z][A-Za-z0-9_]*\)[ \t]*\(#.*\)?\$"; -my $ELSE_PATTERN = "^else[ \t]*\(#.*\)?\$"; -my $ENDIF_PATTERN = "^endif[ \t]*\(#.*\)?\$"; -my $PATH_PATTERN='(\\w|/|\\.)+'; -# This will pass through anything not of the prescribed form. -my $INCLUDE_PATTERN = "^include[ \t]+((\\\$\\\(top_srcdir\\\)/${PATH_PATTERN})|(\\\$\\\(srcdir\\\)/${PATH_PATTERN})|([^/\\\$]${PATH_PATTERN}))[ \t]*(#.*)?\$"; - -my $AM_CONDITIONAL_PATTERN = "AM_CONDITIONAL\\((\\w+)"; -my $AM_INIT_AUTOMAKE = "AM_INIT_AUTOMAKE\\(([^,]+),[ \t]*([^)]+)"; - -# Hash table of AM_CONDITIONAL variables seen in configure. -my %configure_cond = (); - -# This holds the names which are targets. These also appear in -# %contents. -my %targets = (); - -# This holds the line numbers at which various elements of -# %contents are defined. -my %content_lines = (); - -my %content_seen = (); - -# This maps the source extension of a suffix rule to its -# corresponding output extension. -my %suffix_rules = (); - -# Hash table of discovered configure substitutions. Keys are names, -# values are `FILE:LINE' strings which are used by error message -# generation. -my %configure_vars = (); - -# This holds the set of included files. -my @include_stack = (); - -my $verbose = 0; -my $vcond; -my @conditional_stack = (); -my %contents = (); -my %conditional = (); - -# This holds our (eventual) exit status. We don't actually exit until -# we have processed all input files. -my $exit_status = 0; - -my @make_input_list = (); -my %make_list = (); - -# Names used in AC_CONFIG_HEADER call. @config_fullnames holds the -# name which appears in AC_CONFIG_HEADER, colon and all. -# @config_names holds the file names. @config_headers holds the '.in' -# files. Ordinarily these are similar, but they can be different if -# the weird "NAME:FILE" syntax is used. -my @config_fullnames = (); -my @config_names = (); -my @config_headers = (); -# Line number at which AC_CONFIG_HEADER appears in configure.ac. -my $config_header_line = 0; - -# Relative location of top build directory. -my $top_builddir = ''; - -my $relative_dir = '.'; - -my $output_vars = ''; -my $output_trailer = ''; - -# List of Makefile.am's to process, and their corresponding outputs. -my @input_files = (); -my %output_files = (); - -# List of files in AC_OUTPUT without Makefile.am, and their outputs. -my @other_input_files = (); - -my @var_list = (); -my %am_vars = (); -my %def_type = (); - -my @excluded_dirs = (); -my @excluded_files = (); -my $msvc_cflags = ""; -my $msvc_cflagsd = ""; -my $msvc_threads = ""; -my $msvc_libs = ""; -my @extra_sources = (); -my @extra_projects = (); - -# Extracted from AM_INIT_AUTOMAKE(package,version) -my $dsp_package = 'FGFS'; -my $dsp_version = '0.2'; - -my $static_lib = 0; - -parse_arguments(@ARGV); - -# Read project configuration file. -my $rcfile = "am2dsp.cfg"; -read_am2dsprc($rcfile) if -r $rcfile; - -scan_configure(); -die "am2dsp: no \`Makefile.am' found or specified\n" - if ! @input_files; - -if ($static_lib) { - static_lib_dsp_init($dsp_package); -} else { - console_app_dsp_init($dsp_package); -} - -my $am_file; -foreach $am_file (@input_files) { - dsp_add_group($dsp_package, $am_file) if !exclude_dir($am_file); -} -dsp_finish($dsp_package); -generate_dsw( $dsp_package ); - -sub exclude_dir { - my $dir = shift; - foreach my $d (@excluded_dirs) { - if ($dir =~ "/$d/") { - return 1; - } - } - return 0; -} - -sub exclude_file { - my $file = shift; - foreach my $f (@excluded_files) { - if ($file =~ /$f/) { - return 1; - } - } - return 0; -} - -# -# TODO: option to specify static library or console app. -# -sub parse_arguments { - my @av = @_; - - while (@av) { - if ($av[0] eq '--version') { - } elsif ($av[0] eq '--help') { - } elsif ($av[0] eq '--verbose' || $av[0] eq '-v') { - $verbose = 1; - } elsif ($av[0] eq '--package' || $av[0] eq '-p') { - require_argument(@av); - shift @av; - $dsp_package = $av[0]; - } elsif ($av[0] eq '--lib' || $av[0] eq '-l') { - # Create a static library - $static_lib = 1; - } elsif ($av[0] =~ /^-/) { - die "am2dsp: unrecognised option -- `$av[0]'\nTry am2dsp --help for more information.\n"; - } else { - } - shift @av; - } -} - -sub read_am2dsprc { - my $rc_file = shift; - - open( RC_FILE, $rc_file ) - or die "Can't open $rc_file: $!\n"; - my $line; - while (defined($line = )) { - chomp $line; - if ($line =~ s/\\$//) { - # continuation line - $line .= "%"; - $line .= ; - redo unless eof(RC_FILE); - } - - next if $line =~ /^$/; # ignore blank lines - next if $line =~ /^#/; # ignore comments - - if ($line =~ /exclude_dir\s*=\s*(\S+)/) { - push( @excluded_dirs, $1 ); - } - elsif ($line =~ /exclude_file\s*=\s*(\S+)/) { - my $f; - ($f = $1) =~ s/\\/\\\\/g; # escape path separators, "\" -> "\\" - push( @excluded_files, $f ); - print "Excluding file: $f\n" if $verbose; - } - elsif ($line =~ /include_path\s*=\s*\"(.*)\"/) { - $msvc_cflags .= " /I \"$1\""; - $msvc_cflagsd .= " /I \"$1\""; - } - elsif ($line =~ /include_path\s*=\s*(\S+)/) { - $msvc_cflags .= " /I \"$1\""; - $msvc_cflagsd .= " /I \"$1\""; - } - elsif ($line =~ /define\s*=\s*(\S+)/) { - $msvc_cflags .= " /D \"$1\""; - $msvc_cflagsd .= " /D \"$1\""; - } - elsif ($line =~ /lib_path\s*=\s*(\S+)/) { - $msvc_libs .= " /libpath:\"$1\""; - } - elsif ($line =~ /add_lib\s*=\s*(\S+)/) { - $msvc_libs .= " $1.lib"; - } - elsif ($line =~ /type\s*=\s*(\S+)/) { - my ($type,$threads,$debug) = split /,/, $1; - print "type=$type, threading=$threads, debug=$debug\n" if $verbose; - if ($type =~ "ConsoleApplication") { - $static_lib = 0 - } - elsif ($type =~ "StaticLibrary") { - $static_lib = 1 - } - else { - # Invalid type - } - - my $flags = " /ML"; # single threaded. - if ($threads =~ /MultithreadedDLL/) { - $flags = " /MD"; - } - elsif ($threads =~ /Multithreaded/) { - $flags = " /MT"; - } - elsif ($threads =~ /Singlethreaded/) { - $flags = " /ML"; - } - else { - # Invalid threading option. - } - - $msvc_cflags .= $flags; - $flags .= "d"; - $msvc_cflagsd .= $flags; - } - elsif ($line =~ /add_source_file\s*=\s*(.*)/) { - my $rule; - ($rule = $1) =~ s/%/\r\n/g; - push( @extra_sources, $rule ); - } - elsif ($line =~ /add_project\s*=\s*(.*)/) { - push( @extra_projects, $1 ); - } - } - close(RC_FILE); -} - -# Ensure argument exists, or die. -sub require_argument -{ - my ($arg, @arglist) = @_; - die "am2dsp: no argument given for option \`$arg'\n" - if ! @arglist; -} - -sub scan_configure { - scan_one_configure_file('configure.ac'); - scan_one_configure_file('aclocal.m4') - if -f 'aclocal.m4'; - - if (! @input_files) { - @input_files = @make_input_list; - %output_files = %make_list; - } -} - -sub scan_one_configure_file { - my $filename = shift; - open(CONFIGURE, $filename) - || die "am2dsp: can't open \`$filename': $!\n"; - print "am2dsp: reading $filename\n" if $verbose; - - my $in_ac_output = 0; - my $ac_output_line = ''; - - while () { - # Remove comments from current line. - s/\bdnl\b.*$//; - s/\#.*$//; - - # Skip macro definitions. Otherwise we might be confused into - # thinking that a macro that was only defined was actually - # used. - next if /AC_DEFUN/; - - # Follow includes. This is a weirdness commonly in use at - # Cygnus and hopefully nowhere else. - if (/sinclude\((.*)\)/ && -f $1) - { - &scan_one_configure_file ($1); - } - - if (! $in_ac_output && ( s/AC_OUTPUT\s*\(\[?// || s/AC_CONFIG_FILES\s*\(\[?// ) ) { - $in_ac_output = 1; - $ac_output_line = $.; - } - - if ($in_ac_output) - { - my $closing = 0; - if (s/[\]\),].*$//) - { - $in_ac_output = 0; - $closing = 1; - } - - # Look at potential Makefile.am's - foreach (split) - { - # Must skip empty string for Perl 4. - next if $_ eq "\\" || $_ eq ''; - - my ($local,$input,@rest) = split(/:/); - if (! $input) - { - $input = $local; - } - else - { - $input =~ s/\.in$//; - } - - if (-f $input . '.am') - { - push(@make_input_list, $input); - $make_list{$input} = join(':', ($local,@rest)); - } - else - { - # We have a file that automake should cause to be - # rebuilt, but shouldn't generate itself. - push (@other_input_files, $_); - } - } - } - - # Handle configuration headers. A config header of `[$1]' - # means we are actually scanning AM_CONFIG_HEADER from - # aclocal.m4. - if (/A([CM])_CONFIG_HEADER\s*\((.*)\)/ - && $2 ne '[$1]') - { - &am_conf_line_error - ($filename, $., "\`automake requires \`AM_CONFIG_HEADER', not \`AC_CONFIG_HEADER'") - if $1 eq 'C'; - - $config_header_line = $.; - my ($one_hdr); - foreach $one_hdr (split (' ', $2)) - { - push (@config_fullnames, $one_hdr); - if ($one_hdr =~ /^([^:]+):(.+)$/) - { - push (@config_names, $1); - push (@config_headers, $2); - } - else - { - push (@config_names, $one_hdr); - push (@config_headers, $one_hdr . '.in'); - } - } - } - - if (/$AM_CONDITIONAL_PATTERN/o) - { - $configure_cond{$1} = 1; - } - - if (/$AM_INIT_AUTOMAKE/o) - { - $dsp_package = $1; - $dsp_version = $2; - } - } - - close(CONFIGURE); -} - -sub read_main_am_file { - $am_file = shift; - - read_am_file($am_file); - - my @topdir = (); - foreach (split(/\//, $relative_dir)) { - next if $_ eq '.' || $_ eq ''; - if ($_ eq '..') { - pop @topdir; - } else { - push(@topdir, '..'); - } - } - @topdir = ('.') if ! @topdir; - - my $top_builddir = join('/', @topdir); - -} - -sub read_am_file { - $am_file = shift; - open( AM_FILE, $am_file ) - or die "Can't open $am_file: $!\n"; - print "am2dsp: reading $am_file\n" if $verbose; - - my $saw_bk = 0; - my $was_rule = 0; - my $spacing = ''; - my $comment = ''; - my $last_var_name = ''; - my $blank = 0; - - while () - { - if (/$IGNORE_PATTERN/o) - { - # Merely delete comments beginning with two hashes. - } - elsif (/$WHITE_PATTERN/o) - { - # Stick a single white line before the incoming macro or rule. - $spacing = "\n"; - $blank = 1; - } - elsif (/$COMMENT_PATTERN/o) - { - # Stick comments before the incoming macro or rule. Make - # sure a blank line preceeds first block of comments. - $spacing = "\n" unless $blank; - $blank = 1; - $comment .= $spacing . $_; - $spacing = ''; - } - else - { - last; - } - } - - $output_vars .= $comment . "\n"; - $comment = ''; - $spacing = "\n"; - my $source_suffix_pattern = ''; - - my $is_ok_macro = 0; - while ($_) - { - $_ .= "\n" - unless substr ($_, -1, 1) eq "\n"; - - if (/$IGNORE_PATTERN/o) - { - # Merely delete comments beginning with two hashes. - } - elsif (/$WHITE_PATTERN/o) - { - # Stick a single white line before the incoming macro or rule. - $spacing = "\n"; - &am_line_error ($., "blank line following trailing backslash") - if $saw_bk; - } - elsif (/$COMMENT_PATTERN/o) - { - # Stick comments before the incoming macro or rule. - $comment .= $spacing . $_; - $spacing = ''; - &am_line_error ($., "comment following trailing backslash") - if $saw_bk; - } - elsif ($saw_bk) - { - if ($was_rule) - { - $output_trailer .= join ('', @conditional_stack) . $_; - $saw_bk = /\\$/; - } - else - { - $saw_bk = /\\$/; - # Chop newline and backslash if this line is - # continued. ensure trailing whitespace exists. - chop if $saw_bk; - chop if $saw_bk; - $contents{$last_var_name} .= ' ' - unless $contents{$last_var_name} =~ /\s$/; - $contents{$last_var_name} .= $_; - if (@conditional_stack) - { - $conditional{$last_var_name} .= "e_cond_val ($_); - } - } - } - elsif (/$IF_PATTERN/o) - { - &am_line_error ($., "$1 does not appear in AM_CONDITIONAL") - if (! $configure_cond{$1}); - push (@conditional_stack, "\@" . $1 . "_TRUE\@"); - } - elsif (/$ELSE_PATTERN/o) - { - if (! @conditional_stack) - { - &am_line_error ($., "else without if"); - } - elsif ($conditional_stack[$#conditional_stack] =~ /_FALSE\@$/) - { - &am_line_error ($., "else after else"); - } - else - { - $conditional_stack[$#conditional_stack] - =~ s/_TRUE\@$/_FALSE\@/; - } - } - elsif (/$ENDIF_PATTERN/o) - { - if (! @conditional_stack) - { - &am_line_error ($., ": endif without if"); - } - else - { - pop @conditional_stack; - } - } - elsif (/$RULE_PATTERN/o) - { - # Found a rule. - $was_rule = 1; - if (defined $contents{$1} - && (@conditional_stack - ? ! defined $conditional{$1} - : defined $conditional{$1})) - { - &am_line_error ($1, - "$1 defined both conditionally and unconditionally"); - } - # Value here doesn't matter; for targets we only note - # existence. - $contents{$1} = 1; - $targets{$1} = 1; - my $cond_string = join ('', @conditional_stack); - if (@conditional_stack) - { - if ($conditional{$1}) - { - &check_ambiguous_conditional ($1, $cond_string); - $conditional{$1} .= ' '; - } - else - { - $conditional{$1} = ''; - } - $conditional{$1} .= $cond_string . ' 1'; - } - $content_lines{$1} = $.; - $output_trailer .= $comment . $spacing . $cond_string . $_; - $comment = $spacing = ''; - $saw_bk = /\\$/; - - # Check the rule for being a suffix rule. If so, store in - # a hash. - - my $source_suffix; - my $object_suffix; - - if (($source_suffix, $object_suffix) = ($1 =~ $SUFFIX_RULE_PATTERN)) - { - $suffix_rules{$source_suffix} = $object_suffix; - print "Sources ending in .$source_suffix become .$object_suffix\n" if $verbose; - $source_suffix_pattern = "(" . join('|', keys %suffix_rules) . ")"; - } - - # FIXME: make sure both suffixes are in SUFFIXES? Or set - # SUFFIXES from suffix_rules? - } - elsif (($is_ok_macro = /$MACRO_PATTERN/o) - || /$BOGUS_MACRO_PATTERN/o) - { - # Found a macro definition. - $was_rule = 0; - $last_var_name = $1; - if (defined $contents{$1} - && (@conditional_stack - ? ! defined $conditional{$1} - : defined $conditional{$1})) - { - &am_line_error ($1, - "$1 defined both conditionally and unconditionally"); - } - my $value; - if ($3 ne '' && substr ($3, -1) eq "\\") - { - $value = substr ($3, 0, length ($3) - 1); - } - else - { - $value = $3; - } - my $type = $2; - if ($type eq '+') - { - if (! defined $contents{$last_var_name} - && defined $configure_vars{$last_var_name}) - { - $contents{$last_var_name} = '@' . $last_var_name . '@'; - } - $contents{$last_var_name} .= ' ' . $value; - } - else - { - $contents{$last_var_name} = $value; - # The first assignment to a macro sets the line - # number. Ideally I suppose we would associate line - # numbers with random bits of text. - $content_lines{$last_var_name} = $.; - } - my $cond_string = join ('', @conditional_stack); - if (@conditional_stack) - { - my $found = 0; - my $val; - if ($conditional{$last_var_name}) - { - if ($type eq '+') - { - # If we're adding to the conditional, and it - # exists, then we might want to simply replace - # the old value with the new one. - my (@new_vals, @cond_vals); - @cond_vals = split (' ', $conditional{$last_var_name}); - while (@cond_vals) - { - $vcond = shift (@cond_vals); - push (@new_vals, $vcond); - if (&conditional_same ($vcond, $cond_string)) - { - $found = 1; - $val = (&unquote_cond_val (shift (@cond_vals)) - . ' ' . $value); - push (@new_vals, "e_cond_val ($val)); - } - else - { - push (@new_vals, shift (@cond_vals)); - } - } - if ($found) - { - $conditional{$last_var_name} - = join (' ', @new_vals); - } - } - - if (! $found) - { - &check_ambiguous_conditional ($last_var_name, - $cond_string); - $conditional{$last_var_name} .= ' '; - $val = $value; - } - } - else - { - $conditional{$last_var_name} = ''; - $val = $contents{$last_var_name}; - } - if (! $found) - { - $conditional{$last_var_name} .= ($cond_string - . ' ' - . "e_cond_val ($val)); - } - } - # FIXME: this doesn't always work correctly; it will group - # all comments for a given variable, no matter where - # defined. - $am_vars{$last_var_name} = $comment . $spacing; - $def_type{$last_var_name} = ($type eq ':') ? ':' : ''; - push (@var_list, $last_var_name); - $comment = $spacing = ''; - $saw_bk = /\\$/; - - # Error if bogus. - &am_line_error ($., "bad macro name \`$last_var_name'") - if ! $is_ok_macro; - } - elsif (/$INCLUDE_PATTERN/o) - { - my ($path) = $1; - - if ($path =~ s/^\$\(top_srcdir\)\///) - { - push (@include_stack, "\$\(top_srcdir\)/$path"); - } - else - { - $path =~ s/\$\(srcdir\)\///; - push (@include_stack, "\$\(srcdir\)/$path"); - $path = $relative_dir . "/" . $path; - } - &read_am_file ($path); - } - else - { - # This isn't an error; it is probably a continued rule. - # In fact, this is what we assume. - $was_rule = 1; - $output_trailer .= ($comment . $spacing - . join ('', @conditional_stack) . $_); - $comment = $spacing = ''; - $saw_bk = /\\$/; - } - - $_ = ; - } - - close(AM_FILE); - $output_trailer .= $comment; - - &am_error ("unterminated conditionals: " . join (' ', @conditional_stack)) - if (@conditional_stack); -} - -sub initialize_per_input { - # These two variables are used when generating each Makefile.in. - # They hold the Makefile.in until it is ready to be printed. - $output_vars = ''; - $output_trailer = ''; - - # This holds the contents of a Makefile.am, as parsed by - # read_am_file. - %contents = (); - - # This holds the names which are targets. These also appear in - # %contents. - %targets = (); - - # For a variable or target which is defined conditionally, this - # holds an array of the conditional values. The array is composed - # of pairs of condition strings (the variables which configure - # will substitute) and values (the value of a target is - # meaningless). For an unconditional variable, this is empty. - %conditional = (); - - # This holds the line numbers at which various elements of - # %contents are defined. - %content_lines = (); - - # This holds a 1 if a particular variable was examined. - %content_seen = (); - - # This is the conditional stack. - @conditional_stack = (); - - # This holds the set of included files. - @include_stack = (); - - # This holds the "relative directory" of the current Makefile.in. - # Eg for src/Makefile.in, this is "src". - $relative_dir = ''; - - # This maps the source extension of a suffix rule to its - # corresponding output extension. - %suffix_rules = (); - -} - -# Quote a value in order to put it in $conditional. We need to quote -# spaces, and we need to handle null strings, so that we can later -# retrieve values by splitting on space. -sub quote_cond_val -{ - my ($val) = @_; - $val =~ s/ /\001/g; - $val =~ s/\t/\003/g; - $val = "\002" if $val eq ''; - return $val; -} - -# See if a conditional is true. Both arguments are conditional -# strings. This returns true if the first conditional is true when -# the second conditional is true. -sub conditional_true_when -{ - my ($cond, $when) = @_; - - # Check the easy case first. - if ($cond eq $when) - { - return 1; - } - - # Check each component of $cond, which looks @COND1@@COND2@. - foreach my $comp (split ('@', $cond)) - { - # The way we split will give null strings between each - # condition. - next if ! $comp; - - if (index ($when, '@' . $comp . '@') == -1) - { - return 0; - } - } - - return 1; -} - -# Check for an ambiguous conditional. This is called when a variable -# or target is being defined conditionally. If we already know about -# a definition that is true under the same conditions, then we have an -# ambiguity. -sub check_ambiguous_conditional -{ - my ($var_name, $cond) = @_; - my (@cond_vals) = split (' ', $conditional{$var_name}); - while (@cond_vals) - { - my ($vcond) = shift (@cond_vals); - shift (@cond_vals); - if (&conditional_true_when ($vcond, $cond) - || &conditional_true_when ($cond, $vcond)) - { - print "$var_name multiply defined in condition"; - } - } -} - -sub am_line_error -{ - my ($symbol, @args) = @_; - - if ($symbol && "$symbol" ne '-1') - { - my ($file) = "${am_file}"; - - if ($symbol =~ /^\d+$/) - { - # SYMBOL is a line number, so just add the colon. - $file .= ':' . $symbol; - } - elsif (defined $content_lines{$symbol}) - { - # SYMBOL is a variable defined in Makefile.am, so add the - # line number we saved from there. - $file .= ':' . $content_lines{$symbol}; - } - elsif (defined $configure_vars{$symbol}) - { - # SYMBOL is a variable defined in configure.ac, so add the - # appropriate line number. - $file = $configure_vars{$symbol}; - } - else - { - # Couldn't find the line number. - } - warn $file, ": ", join (' ', @args), "\n"; - $exit_status = 1; - } - else - { - &am_error (@args); - } -} - -sub generate_dsw -{ - my $name = shift; - my $dsw_name = $name . '.dsw'; - open(DSW, ">$dsw_name") - || die "Can't create $dsw_name: $!\n"; - - print "Creating $dsw_name\n" if $verbose; - - print DSW <<"EOF"; -Microsoft Developer Studio Workspace File, Format Version 6.00\r -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r -\r -###############################################################################\r -\r -EOF - print DSW 'Project: ', "\"$name\"=\".\\", $name, ".dsp\" - Package Owner=<4>\r\n"; - print DSW <<"EOF"; -\r -Package=<5>\r -{{{\r -}}}\r -\r -Package=<4>\r -{{{\r -}}}\r -\r -EOF - - foreach my $p (@extra_projects) { - print DSW "###############################################################################\r\n\r\n"; - my ($dsp,$name) = split ',', $p; - print "Project $name=$dsp\n" if $verbose; - print DSW "Project: \"$name\"=\"$dsp\" - Package Owner=<4>\r\n\r\n"; - print DSW <<"EOF"; -Package=<5>\r -{{{\r -}}}\r -\r -Package=<4>\r -{{{\r -}}}\r -\r -EOF - } - - print DSW <<"EOF"; -###############################################################################\r -\r -Global:\r -\r -Package=<5>\r -{{{\r -}}}\r -\r -Package=<3>\r -{{{\r -}}}\r -\r -###############################################################################\r -\r -EOF - close(DSW); -} - -sub expand_here { - local $_ = shift; - s/\%cflags\%/$msvc_cflags/g; - s/\%cflagsd\%/$msvc_cflagsd/g; - s/\%libs\%/$msvc_libs/g; - return $_; -} - -sub console_app_dsp_init -{ - my $name = shift; - my $dsp_name = $name . '.dsp'; - - open(DSP, ">$dsp_name") - || die "Can't create $dsp_name: $!\n"; - - print "Creating $dsp_name\n" if $verbose; - - print DSP expand_here(<<"EOF"); -# Microsoft Developer Studio Project File - Name="$name" - Package Owner=<4>\r -# Microsoft Developer Studio Generated Build File, Format Version 6.00\r -# ** DO NOT EDIT **\r -\r -# TARGTYPE "Win32 (x86) Console Application" 0x0103\r -\r -CFG=$name - Win32 Debug\r -!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r -!MESSAGE use the Export Makefile command and run\r -!MESSAGE \r -!MESSAGE NMAKE /f "$name.mak".\r -!MESSAGE \r -!MESSAGE You can specify a configuration when running NMAKE\r -!MESSAGE by defining the macro CFG on the command line. For example:\r -!MESSAGE \r -!MESSAGE NMAKE /f "$name.mak" CFG="$name - Win32 Debug"\r -!MESSAGE \r -!MESSAGE Possible choices for configuration are:\r -!MESSAGE \r -!MESSAGE "$name - Win32 Release" (based on "Win32 (x86) Console Application")\r -!MESSAGE "$name - Win32 Debug" (based on "Win32 (x86) Console Application")\r -!MESSAGE \r -\r -# Begin Project\r -# PROP AllowPerConfigDependencies 0\r -# PROP Scc_ProjName ""\r -# PROP Scc_LocalPath ""\r -CPP=cl.exe\r -RSC=rc.exe\r -\r -!IF "\$(CFG)" == "$name - Win32 Release"\r -\r -# PROP Use_MFC 0\r -# PROP Use_Debug_Libraries 0\r -# PROP Output_Dir "Release"\r -# PROP Intermediate_Dir "Release"\r -# PROP Target_Dir ""\r -# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c %cflags%\r -# SUBTRACT CPP /YX\r -# ADD RSC /l 0xc09 /d "NDEBUG"\r -BSC32=bscmake.exe\r -# ADD BSC32 /nologo\r -LINK32=link.exe\r -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 %libs%\r -\r -!ELSEIF "\$(CFG)" == "$name - Win32 Debug"\r -\r -# PROP Use_MFC 0\r -# PROP Use_Debug_Libraries 1\r -# PROP Output_Dir "Debug"\r -# PROP Intermediate_Dir "Debug"\r -# PROP Ignore_Export_Lib 0\r -# PROP Target_Dir ""\r -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c %cflagsd%\r -# ADD RSC /l 0xc09 /d "_DEBUG"\r -BSC32=bscmake.exe\r -# ADD BSC32 /nologo\r -LINK32=link.exe\r -# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib gdi32.lib shell32.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept %libs%\r -\r -!ENDIF \r -\r -# Begin Target\r -\r -# Name "$name - Win32 Release"\r -# Name "$name - Win32 Debug"\r -EOF - - close(DSP); -} - -sub static_lib_dsp_init -{ - my $name = shift; - my $dsp_name = $name . '.dsp'; - - open(DSP, ">$dsp_name") - || die "Can't create $dsp_name: $!\n"; - - print "Creating $dsp_name\n" if $verbose; - - print DSP expand_here(<<"EOF"); -# Microsoft Developer Studio Project File - Name="$name" - Package Owner=<4>\r -# Microsoft Developer Studio Generated Build File, Format Version 6.00\r -# ** DO NOT EDIT **\r -\r -# TARGTYPE "Win32 (x86) Static Library" 0x0104\r -\r -CFG=$name - Win32 Debug\r -!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r -!MESSAGE use the Export Makefile command and run\r -!MESSAGE \r -!MESSAGE NMAKE /f "$name.mak".\r -!MESSAGE \r -!MESSAGE You can specify a configuration when running NMAKE\r -!MESSAGE by defining the macro CFG on the command line. For example:\r -!MESSAGE \r -!MESSAGE NMAKE /f "$name.mak" CFG="$name - Win32 Debug"\r -!MESSAGE \r -!MESSAGE Possible choices for configuration are:\r -!MESSAGE \r -!MESSAGE "$name - Win32 Release" (based on "Win32 (x86) Static Library")\r -!MESSAGE "$name - Win32 Debug" (based on "Win32 (x86) Static Library")\r -!MESSAGE \r -\r -# Begin Project\r -# PROP AllowPerConfigDependencies 0\r -# PROP Scc_ProjName ""\r -# PROP Scc_LocalPath ""\r -CPP=cl.exe\r -RSC=rc.exe\r -\r -!IF "\$(CFG)" == "$name - Win32 Release"\r -\r -# PROP Use_MFC 0\r -# PROP Use_Debug_Libraries 0\r -# PROP Output_Dir "Release"\r -# PROP Intermediate_Dir "Release"\r -# PROP Target_Dir ""\r -# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_MBCS" /FD /c %cflags%\r -# ADD RSC /l 0x409 /d "NDEBUG"\r -BSC32=bscmake.exe\r -# ADD BASE BSC32 /nologo\r -# ADD BSC32 /nologo\r -LINK32=link.exe -lib\r -# ADD BASE LIB32 /nologo\r -# ADD LIB32 /nologo\r -\r -!ELSEIF "\$(CFG)" == "$name - Win32 Debug"\r -\r -# PROP Use_MFC 0\r -# PROP Use_Debug_Libraries 1\r -# PROP Output_Dir "Debug"\r -# PROP Intermediate_Dir "Debug"\r -# PROP Target_Dir ""\r -# ADD CPP /nologo /W3 /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_MBCS" /FR /FD /GZ /c %cflagsd%\r -# ADD RSC /l 0x409 /d "_DEBUG"\r -BSC32=bscmake.exe\r -# ADD BASE BSC32 /nologo\r -# ADD BSC32 /nologo\r -LINK32=link.exe -lib\r -# ADD BASE LIB32 /nologo\r -# ADD LIB32 /nologo\r -\r -!ENDIF \r -\r -# Begin Target\r -\r -# Name "$name - Win32 Release"\r -# Name "$name - Win32 Debug"\r -EOF - - close(DSP); -} - -sub dsp_add_source_rule { - my ($fh,$dsp_name,$group,$file) = @_; - print $fh "# Begin Source File\r\n"; - print $fh "\r\n"; - print $fh "SOURCE=$file\r\n"; - print $fh "\r\n"; - print $fh "!IF \"\$(CFG)\" == \"$dsp_name - Win32 Release\"\r\n"; - print $fh "\r\n"; - print $fh "# PROP Intermediate_Dir \"Release\\$group\"\r\n"; - print $fh "# PROP Exclude_From_Build 1\r\n" if exclude_file($file); - print $fh "\r\n"; - print $fh "!ELSEIF \"\$(CFG)\" == \"$dsp_name - Win32 Debug\"\r\n"; - print $fh "\r\n"; - print $fh "# PROP Intermediate_Dir \"Debug\\$group\"\r\n"; - print $fh "# PROP Exclude_From_Build 1\r\n" if exclude_file($file); - print $fh "\r\n"; - print $fh "!ENDIF \r\n"; - print $fh "\r\n"; - print $fh "# End Source File\r\n"; -} - -sub dsp_add_group { - my ($dsp_name,$makefile) = @_; - my $base_dir = './'; - - initialize_per_input(); - my $relative_dir = dirname($makefile); - - read_main_am_file($makefile . '.am'); - - open(DSP, ">>$dsp_name" . '.dsp') - || die "Can't append to $dsp_name: $!\n"; - - foreach my $key (sort keys %contents) { - if ($key eq "include_HEADERS") { - } - if ($key =~ /^lib(.*)_a_SOURCES/) { - my $group = 'Lib_' . $1; - print DSP "# Begin Group \"$group\"\r\n"; - print DSP "\r\n"; - print DSP "# PROP Default_Filter \"\"\r\n"; - my @files = split(' ', $contents{$key}); - foreach (@files) { - my $file; - my $src_dir = $base_dir . $relative_dir . '/'; - $src_dir =~ s/\//\\/g; # fixup DOS path separators - - if (/^\$\(([^\)]*)\)$/) { - # Found a variable. - my $varname = $1; - foreach (split(' ', $contents{$varname})) { - $file = $src_dir . $_; - dsp_add_source_rule(\*DSP, $dsp_name, $group, $file); - } - } else { - $file = $src_dir . $_; - dsp_add_source_rule(\*DSP, $dsp_name, $group, $file); - } - } - - print DSP "# End Group\r\n"; - } - #elsif ($key =~ /(.*)_SOURCES/) { - elsif ($key eq "fgfs_SOURCES") { - my $group = 'main'; - print DSP "# Begin Group \"$group\"\r\n"; - print DSP "\r\n"; - print DSP "# PROP Default_Filter \"\"\r\n"; - my @files = split(' ', $contents{$key}); - foreach (@files) { - my $file; - my $src_dir = $base_dir . $relative_dir . '/'; - $src_dir =~ s/\//\\/g; # fixup DOS path separators - - dsp_add_source_rule(\*DSP, $dsp_name, $group, $src_dir . $_); - if (0) { - my $f = $base_dir . $relative_dir . '/' . $_; - $f =~ s/\//\\/g; - print DSP "# Begin Source File\r\n"; - print DSP "\r\n"; - print DSP "SOURCE=$f\r\n"; - print DSP "\r\n"; - print DSP "!IF \"\$(CFG)\" == \"$dsp_name - Win32 Release\"\r\n"; - print DSP "\r\n"; - print DSP "# PROP Intermediate_Dir \"Release\\$group\"\r\n"; - print DSP "\r\n"; - print DSP "!ELSEIF \"\$(CFG)\" == \"$dsp_name - Win32 Debug\"\r\n"; - print DSP "\r\n"; - print DSP "# PROP Intermediate_Dir \"Debug\\$group\"\r\n"; - print DSP "\r\n"; - print DSP "!ENDIF \r\n"; - print DSP "\r\n"; - print DSP "# End Source File\r\n"; - } - } - print DSP "# End Group\r\n"; - } - } - close(DSP); -} - -sub dsp_finish { - my $dsp_name = shift; - - open(DSP, ">>$dsp_name" . '.dsp') - || die "Can't append to $dsp_name: $!\n"; - - foreach my $r (@extra_sources) { - print DSP "# Begin Source File\r\n\r\n"; - print DSP "$r\r\n"; - print DSP "# End Source File\r\n"; - } - print DSP "# End Target\r\n"; - print DSP "# End Project\r\n"; - - close(DSP); -} - -# Return directory name of file. -sub dirname -{ - my ($file) = @_; - my ($sub); - - ($sub = $file) =~ s,/+[^/]+$,,g; - $sub = '.' if $sub eq $file; - return $sub; -} - diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 5f504000..00000000 --- a/autogen.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -OSTYPE=`uname -s` -MACHINE=`uname -m` -AUTO_MAKE_VERSION=`automake --version | head -1 | awk '{print $4}' | sed -e 's/\.\([0-9]*\).*/\1/'` -if test $AUTO_MAKE_VERSION -lt 15; then - echo "" - echo "You need to upgrade to automake version 1.5 or greater." - echo "Most distributions have packages available to install or you can" - echo "find the source for the most recent version at" - echo "ftp://ftp.gnu.org/gnu/automake" - exit 1 -fi - -echo "Host info: $OSTYPE $MACHINE" -echo -n " automake: `automake --version | head -1 | awk '{print $4}'`" -echo " ($AUTO_MAKE_VERSION)" -echo "" - -echo "Running aclocal $ACLOCAL_OPTS" -aclocal $ACLOCAL_OPTS - -echo "Running autoheader" -autoheader -if [ ! -e src/Include/config.h.in ]; then - echo "ERROR: autoheader didn't create simgear/simgear_config.h.in!" - exit 1 -fi - -echo "Running automake --add-missing" -automake --add-missing - -echo "Running autoconf" -autoconf - -if [ ! -e configure ]; then - echo "ERROR: configure was not created!" - exit 1 -fi - -echo "" -echo "======================================" - -if [ -f config.cache ]; then - echo "config.cache exists. Removing the config.cache file will force" - echo "the ./configure script to rerun all it's tests rather than using" - echo "the previously cached values." - echo "" -fi - -echo "Now you are ready to run './configure'" -echo "======================================" diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 90c375f4..00000000 --- a/configure.ac +++ /dev/null @@ -1,486 +0,0 @@ -dnl Process this file with aclocal ; automake -a ; autoconf to produce a -dnl working configure script. - -AC_INIT -AC_CONFIG_SRCDIR([src/Lib/DEM/dem.cxx]) - -# Require at least automake 2.52 -AC_PREREQ(2.59) - -dnl Initialize the automake stuff -AM_INIT_AUTOMAKE(TerraGear, 0.9.8-wcsp) - -dnl Checks for programs. -AC_PROG_MAKE_SET -AC_PROG_CC -AC_PROG_CXX -AC_PROG_RANLIB -AC_PROG_INSTALL -AC_PROG_LN_S - -# specify the simgear location -AC_ARG_WITH(simgear, [ --with-simgear=PREFIX Specify the prefix path to simgear]) - -if test "x$with_simgear" != "x" ; then - echo "SimGear prefix path is $with_simgear" - EXTRA_DIRS="${EXTRA_DIRS} $with_simgear" -fi - -# specify the osg location -AC_ARG_WITH(osg, [ --with-osg=PREFIX Specify the prefix path to osg]) - -if test "x$with_osg" != "x" ; then - echo "osg prefix is $with_osg" - EXTRA_DIRS="${EXTRA_DIRS} $with_osg" -fi - -dnl set the $host variable based on local machine/os -AC_CANONICAL_HOST - -case "${host}" in -*-*-irix*) - AC_DEFINE([_SOCKLEN_T], 1, [Prevent a nasty bug in IRIX 6.5.17]) - if test "$CXX" = "CC"; then - AR="CC -ar" - ARFLAGS="-o" - CXXFLAGS="$CXXFLAGS -I$with_simgear/include/simgear/compatibility" - else - AR="ar" - ARFLAGS="cru" - fi - ;; -*) - AR="ar" - ARFLAGS="cru" - ;; -esac -AC_SUBST(AR) -AC_SUBST(ARFLAGS) - -dnl Specify if we want logging (testing build) or not (release build) -# set logging default value -# with_logging=yes -AC_ARG_WITH(logging, [ --with-logging Include logging output (default)]) -if test "x$with_logging" = "xno" ; then - AC_DEFINE([FG_NDEBUG], 1, [Define for no logging output]) -fi - - -dnl Let the Win32 user specify if they want to build with the SGI -dnl opengl.dll as opposed to the more standard openg32.dll -AC_ARG_WITH(sgi-opengl, [ --with-sgi-opengl Build against SGI's opengl.dll glu.dll and glut.dll]) - -# specify gdal support -AC_DEFINE([HAVE_OGR],[],[Use OGR]) - -AC_ARG_WITH(gdal, - AC_HELP_STRING([--with-gdal[=path/gdal-config]], - [enable GDAL/OGR support (gdal-config with path, - e.g. '--with-gdal=/usr/local/bin/gdal-config', - default: enabled if gdal-config is in PATH)])) - -AC_ARG_ENABLE(ogrdecode, - AC_HELP_STRING([--disable-ogrdecode], - [enable ogrdecode tool (default depending on OGR availability)])) - -AC_ARG_ENABLE(gdalchop, - AC_HELP_STRING([--enable-gdalchop], - [enable gdalchop tool (default depending on GDAL availability)])) - -AC_ARG_ENABLE(poly2ogr, - AC_HELP_STRING([--disable-poly2ogr], - [enable poly2ogr tool (default depending on OGR availability)])) - -if test "$with_gdal" != "no" ; then - if test "`basename xx/$with_gdal`" = "gdal-config" ; then - # gdal-config was specified - GDAL_CONFIG="$with_gdal" - with_gdal="yes" - else - # gdal-config was not specified, but GDAL/OGR wasn't disabled - AC_PATH_PROG(GDAL_CONFIG, gdal-config, no) - if test "$GDAL_CONFIG" = "no" ; then - with_gdal="no" - fi - fi - - GDAL_LIBS= - GDAL_CFLAGS= - USE_GDAL= - USE_OGR= - - AC_MSG_CHECKING([for GDAL...]) - if test -x "$GDAL_CONFIG"; then - AC_MSG_RESULT(yes) - GDAL_LIBS=`"$GDAL_CONFIG" --libs` - GDAL_DEP_LIBS=`"$GDAL_CONFIG" --dep-libs` - GDAL_CFLAGS=`"$GDAL_CONFIG" --cflags` - have_gdal=yes - AC_MSG_CHECKING([for OGR...]) - if test `"$GDAL_CONFIG" --ogr-enabled` = "yes" ; then - AC_MSG_RESULT(yes) - have_ogr=yes - else - AC_MSG_RESULT(no) - fi - else - AC_MSG_RESULT(no) - fi - - GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS" - - AC_SUBST(GDAL_LIBS) - AC_SUBST(GDAL_CFLAGS) -fi - -if test x$have_ogr != xyes -a x$enable_ogrdecode = xyes; then - AC_MSG_ERROR([ogrdecode was forcefully enabled but OGR was not found. - Please make sure that you have GDAL installed with OGR enabled - and gdal-config in your PATH resp. the path to gdal-config provided - using --with-gdal.]) -fi - -if test x$have_gdal != xyes -a x$enable_gdalchop = xyes; then - AC_MSG_ERROR([gdalchop was forcefully enabled but GDAL was not found. - Please make sure that you have GDAL installed - and gdal-config in your PATH resp. the path to gdal-config provided - using --with-gdal.]) -fi - -if test x$have_ogr != xyes -a x$enable_poly2ogr = xyes; then - AC_MSG_ERROR([poly2ogr was forcefully enabled but OGR was not found. - Please make sure that you have GDAL installed with OGR enabled - and gdal-config in your PATH resp. the path to gdal-config provided - using --with-gdal.]) -fi - -AM_CONDITIONAL(WANT_OGRDECODE, test x$have_ogr = xyes -a x$enable_ogrdecode != xno) -AM_CONDITIONAL(WANT_GDALCHOP, test x$have_gdal = xyes -a x$enable_gdalchop != xno) -AM_CONDITIONAL(WANT_POLY2OGR, test x$have_ogr = xyes -a x$enable_poly2ogr != xno) - -dnl Check for MS Windows environment -AC_CHECK_HEADER(windows.h) - -dnl extra library and include directories -EXTRA_DIRS="$EXTRA_DIRS /usr/X11R6" - -if test -d /opt/X11R6 ; then - EXTRA_DIRS="$EXTRA_DIRS /opt/X11R6" -fi - -if test "x$ac_cv_header_windows_h" = "xyes" ; then - EXTRA_DIRS="${EXTRA_DIRS} `pwd`/Win32" -fi -wi_EXTRA_DIRS(no, ${EXTRA_DIRS}) - -dnl Using AM_CONDITIONAL is a step out of the protected little -dnl automake fold so it is potentially dangerous. But, we are -dnl beginning to run into cases where the standard checks are not -dnl enough. AM_CONDITIONALS are then referenced to conditionally -dnl build a Makefile.in from a Makefile.am which lets us define custom -dnl includes, compile alternative source files, etc. - -dnl Check for X11 (fancy) -AC_PATH_XTRA - -dnl Checks for libraries. - -null_LIBS="$LIBS" -LIBS="" - -dnl search for network related libraries -AC_SEARCH_LIBS(inet_addr, xnet) -AC_SEARCH_LIBS(socket, socket) -AC_SEARCH_LIBS(main, nsl) - -network_LIBS="$LIBS" -LIBS="" - -dnl check for some default libraries -AC_SEARCH_LIBS(cos, m) -AC_SEARCH_LIBS(clock_gettime, rt) - -base_LIBS="$LIBS" - -AC_SEARCH_LIBS(XCreateWindow, X11) -AC_SEARCH_LIBS(XShmCreateImage, Xext) -AC_SEARCH_LIBS(XGetExtensionVersion, Xi) -AC_SEARCH_LIBS(IceOpenConnection, ICE) -AC_SEARCH_LIBS(SmcOpenConnection, SM) -AC_SEARCH_LIBS(XtMalloc, Xt) -AC_SEARCH_LIBS(XmuLookupStandardColormap, Xmu) - -dnl check for OpenGL related libraries - -if test "x$ac_cv_header_windows_h" != "xyes" ; then - dnl Reasonable stuff for non-windoze variants ... :-) - - AC_SEARCH_LIBS(glNewList, [ GL GLcore MesaGL ]) - if test "x$ac_cv_search_glNewList" = "x-lGLcore"; then - dnl if GLcore found, then also check for GL - AC_SEARCH_LIBS(glXCreateContext, GL) - fi - - dnl if using mesa, check for xmesa.h - if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then - AC_CHECK_HEADER(GL/xmesa.h) - if test "x$ac_cv_header_GL_xmesa_h" = "xyes"; then - AC_DEFINE([XMESA], 1, [Define for Mesa FX mode]) - AC_DEFINE([FX], 1, [Define for Mesa FX mode]) - fi - fi - - AC_SEARCH_LIBS(gluLookAt, [ GLU MesaGLU ]) - AC_SEARCH_LIBS(glutGetModifiers, [ glut freeglut ]) - -else - dnl Win32 is a little wierd because it has to try to handle the various - dnl winbloze-isms. We'll just do this manually for now. - - echo Win32 specific hacks... - AC_DEFINE([WIN32], 1, [Define if building on a Win32 platform]) - AC_DEFINE([NOMINMAX], 1, [Define for Win32 platforms]) - - dnl just define these to true and hope for the best - ac_cv_lib_glut_glutGetModifiers="yes" - ac_cv_lib_glut_glutGameModeString="yes" - - if test "x$with_sgi_opengl" = "xyes" ; then - echo "Building with glut.dll, glu.dll, and opengl.dll" - WIN32_GLUT=glut - WIN32_GLU=glu - WIN32_OPENGL=opengl - else - echo "Building with glut32.dll, glu32.dll, and opengl32.dll" - WIN32_GLUT=glut32 - WIN32_GLU=glu32 - WIN32_OPENGL=opengl32 - fi - - LIBS="$LIBS -l${WIN32_GLUT} -l${WIN32_GLU} -l${WIN32_OPENGL}" - LIBS="$LIBS -luser32 -lgdi32" - echo "Will link apps with $LIBS" -fi - -if test "x$ac_cv_lib_glut_glutGetModifiers" = "xno"; then - echo - echo "Unable to find the necessary OpenGL or GLUT libraries." - echo "See config.log for automated test details and results ..." - exit 1 -fi - -if test "x$ac_cv_lib_glut_glutGameModeString" = "xno"; then - echo - echo "Your version of glut doesn't support game mode." - echo "You need to fetch and install the latest version of glut from:" - echo - echo " http://reality.sgi.com/opengl/glut3/glut3.html" - exit 1 -fi - -AC_CHECK_LIB(tiff, TIFFOpen,,,) -AM_CONDITIONAL(HAVE_LIBTIFF, test x$ac_cv_lib_tiff_TIFFOpen = xyes) - -AC_LANG_PUSH(C++) - -opengl_LIBS="$LIBS" -LIBS="$base_LIBS" - -AC_SUBST(base_LIBS) -AC_SUBST(opengl_LIBS) -AC_SUBST(network_LIBS) -AC_SUBST(support_LIBS) - -AM_CONDITIONAL(HAVE_XWINDOWS, test "x$ac_cv_lib_X11_XCreateWindow" = "xyes" ) - -dnl Check for "libnewmat" without which we cannot build airport surfaces -AC_CHECK_HEADER(newmat/newmat.h) -AM_CONDITIONAL(HAVE_NEWMAT, test "x$ac_cv_header_newmat_newmat_h" = "xyes" ) -AC_LANG_POP - -dnl Check if Generic Polygon Clipping library is installed -dnl (from http://www.cs.man.ac.uk/aig/staff/alan/software/) -AC_CHECK_HEADERS( gpc.h ) -if test "x$ac_cv_header_gpc_h" != "xyes"; then - echo - echo "You need to have the GPC library installed on your system to" - echo "build some of the scenery generation tools, otherwise you won't" - echo "be able to create scenery." - echo - echo "Please see README.gpc for more details." - echo - echo "configure aborted." - exit -fi - -dnl Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS( \ - fcntl.h getopt.h malloc.h memory.h stdlib.h sys/param.h sys/stat.h \ - sys/time.h sys/timeb.h unistd.h windows.h winbase.h values.h ) - -# Check for system installed zlib -AC_CHECK_HEADER(zlib.h) -if test "x$ac_cv_header_zlib_h" != "xyes"; then - echo "no zlib found, please install before continuing." - exit -fi - -# Check for the presence of SimGear -AC_CHECK_HEADER(simgear/version.h) -if test "x$ac_cv_header_simgear_version_h" != "xyes"; then - echo - echo "You *must* have the SimGear support library installed on your system" - echo "to build TerraGear!" - echo - echo "Please see README.SimGear for more details." - echo - echo "configure aborted." - exit -fi - -AC_MSG_CHECKING(for proper simgear version) - -AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include -#include - -#if !defined(SIMGEAR_VERSION) -#error simgear version too old, please upgrade. -#endif - -#define STRINGIFY(X) XSTRINGIFY(X) -#define XSTRINGIFY(X) #X - -#define MIN_MAJOR 0 -#define MIN_MINOR 3 -#define MIN_MICRO 8 - -int main() { - int major, minor, micro; - - printf("%d.%d.%d or greater... ", MIN_MAJOR, MIN_MINOR, MIN_MICRO); - - sscanf( STRINGIFY(SIMGEAR_VERSION), "%d.%d.%d", &major, &minor, µ ); - - if ( major < MIN_MAJOR ) { - return -1; - } else if ( major == MIN_MAJOR && minor < MIN_MINOR ) { - return -1; - } else if ( major == MIN_MAJOR && minor == MIN_MINOR && micro < MIN_MICRO ){ - return -1; - } - - return 0; -} - -]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(wrong version); - AC_MSG_ERROR([Install latest simgear first...])],[AC_MSG_RESULT(yes) -]) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_SIZE_T -AC_HEADER_TIME -AC_STRUCT_TM - -dnl check for socklen_t (in Unix98) -AC_MSG_CHECKING(for socklen_t) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -#include -int accept (int, struct sockaddr *, socklen_t *); -]], [[]])],[ -AC_MSG_RESULT(yes)],[ -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -#include -int accept (int, struct sockaddr *, size_t *); -]], [[]])],[ -AC_MSG_RESULT(size_t) -AC_DEFINE([socklen_t], size_t, [Define for socklen_t])],[ -AC_MSG_RESULT(int) -AC_DEFINE([socklen_t], int, [Define for socklen_t])])]) - -dnl Checks for library functions. -AC_TYPE_SIGNAL -AC_FUNC_VPRINTF -AC_CHECK_FUNCS( ftime gettimeofday timegm memcpy bcopy mktime strstr rand \ - random setitimer getitimer signal GetLocalTime rint getrusage ) - -AM_CONFIG_HEADER(src/Include/config.h) - -AC_CONFIG_FILES([ \ - VERSION \ - Makefile \ - src/Makefile \ - src/Include/Makefile \ - src/Airports/Makefile \ - src/Airports/GenAirports/Makefile \ - src/BuildTiles/Makefile \ - src/BuildTiles/Clipper/Makefile \ - src/BuildTiles/GenOutput/Makefile \ - src/BuildTiles/Match/Makefile \ - src/BuildTiles/Triangulate/Makefile \ - src/BuildTiles/Main/Makefile \ - src/BuildTiles/Osgb36/Makefile \ - src/BuildTiles/Parallel/Makefile \ - src/Lib/Makefile \ - src/Lib/Array/Makefile \ - src/Lib/DEM/Makefile \ - src/Lib/e00/Makefile \ - src/Lib/Geometry/Makefile \ - src/Lib/HGT/Makefile \ - src/Lib/landcover/Makefile \ - src/Lib/Optimize/Makefile \ - src/Lib/Output/Makefile \ - src/Lib/Polygon/Makefile \ - src/Lib/poly2tri/Makefile \ - src/Lib/shapelib/Makefile \ - src/Lib/TriangleJRS/Makefile \ - src/Lib/vpf/Makefile \ - src/Prep/Makefile \ - src/Prep/DemChop/Makefile \ - src/Prep/DemInfo/Makefile \ - src/Prep/DemRaw2ascii/Makefile \ - src/Prep/E00Lines/Makefile \ - src/Prep/GDALChop/Makefile \ - src/Prep/GSHHS/Makefile \ - src/Prep/MergerClipper/Makefile \ - src/Prep/Photo/Makefile \ - src/Prep/OGRDecode/Makefile \ - src/Prep/ShapeFile/Makefile \ - src/Prep/TGVPF/Makefile \ - src/Prep/Terra/Makefile \ - src/Prep/TerraFit/Makefile \ - src/Prep/Tower/Makefile \ - src/Prep/UserDef/Makefile \ - src/Utils/Makefile \ - src/Utils/cdrom/Makefile \ - src/Utils/download-map/Makefile \ - src/Utils/poly2ogr/Makefile \ -]) -AC_OUTPUT - -echo "" -echo "Configure Summary" -echo "=================" - -echo "Prefix: $prefix" - -if test "x$with_logging" != "x"; then - echo "Debug messages: $with_logging" -else - echo "Debug messages: yes" -fi - -if test "x$ac_cv_header_newmat_newmat_h" != "xyes"; then - echo - echo "You must have the newmat library installed on your system to build" - echo "the GenAirport utility. This program will not be built." - echo - echo "Please see README.newmat for more details." - echo -fi - -dnl :mode=text:indentSize=2: diff --git a/src/Airports/GenAirports/Makefile.am b/src/Airports/GenAirports/Makefile.am deleted file mode 100644 index c8c401b1..00000000 --- a/src/Airports/GenAirports/Makefile.am +++ /dev/null @@ -1,64 +0,0 @@ -#--------------------------------------------------------------------------- -# Makefile -# -# Written by Curtis Olson, started January 1998. -# -# Copyright (C) 1998 Curtis L. Olson - http://www.flightgear.org/~curt -# -# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# $Id: Makefile.am,v 1.20 2005-09-09 15:05:15 curt Exp $ -#--------------------------------------------------------------------------- - - -bin_PROGRAMS = genapts - -genapts_SOURCES = \ - apt_surface.hxx apt_surface.cxx \ - build.cxx build.hxx \ - convex_hull.cxx convex_hull.hxx \ - elevations.cxx elevations.hxx \ - global.hxx \ - lights.hxx lights.cxx \ - main.cxx \ - point2d.cxx point2d.hxx \ - poly_extra.cxx poly_extra.hxx \ - runway.cxx runway.hxx \ - rwy_common.cxx rwy_common.hxx \ - rwy_nonprec.cxx rwy_nonprec.hxx \ - rwy_prec.cxx rwy_prec.hxx \ - rwy_simple.cxx rwy_simple.hxx \ - rwy_visual.cxx rwy_visual.hxx \ - taxiway.cxx taxiway.hxx \ - texparams.hxx - -genapts_LDADD = \ - $(top_builddir)/src/Lib/Array/libArray.a \ - $(top_builddir)/src/Lib/Polygon/libPolygon.a \ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/src/Lib/Geometry/libGeometry.a \ - $(top_builddir)/src/Lib/Output/libOutput.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lsgstructure -lsgxml \ - -lgenpolyclip \ - -lnewmat \ - -lz \ - $(base_LIBS) - -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/Lib \ - -I$(top_srcdir)/src/BuildTiles diff --git a/src/Airports/Makefile.am b/src/Airports/Makefile.am deleted file mode 100644 index 9e114cf6..00000000 --- a/src/Airports/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -if HAVE_NEWMAT -GEN_AIRPORTS_DIR = GenAirports -else -GEN_AIRPORTS_DIR = -endif - -SUBDIRS = $(GEN_AIRPORTS_DIR) diff --git a/src/Airspace/Makefile.am b/src/Airspace/Makefile.am deleted file mode 100644 index f3ca0217..00000000 --- a/src/Airspace/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -bin_PROGRAMS = airspace - -airspace_SOURCES = airspace.cxx - -airspace_LDADD = -lsgmath -lsgmisc -lsgdebug diff --git a/src/BuildTiles/Clipper/Makefile.am b/src/BuildTiles/Clipper/Makefile.am deleted file mode 100644 index eba26943..00000000 --- a/src/BuildTiles/Clipper/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -noinst_LIBRARIES = libClipper.a - -libClipper_a_SOURCES = clipper.cxx clipper.hxx priorities.cxx priorities.hxx -dist_pkgdata_DATA = default_priorities.txt -noinst_PROGRAMS = testclipper - -testclipper_SOURCES = testclipper.cxx -testclipper_LDADD = libClipper.a \ - $(top_builddir)/src/BuildTiles/Osgb36/libOsgb36.a \ - $(top_builddir)/src/BuildTiles/Triangulate/libTriangulate.a \ - $(top_builddir)/src/Lib/Polygon/libPolygon.a \ - $(top_builddir)/src/Lib/Geometry/libGeometry.a \ - $(top_builddir)/src/Lib/landcover/liblandcover.a \ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgbucket -lsgdebug -lsgmath -lsgmisc -lsgstructure -lsgxml \ - -lgenpolyclip -lz - -INCLUDES = -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles - diff --git a/src/BuildTiles/GenOutput/Makefile.am b/src/BuildTiles/GenOutput/Makefile.am deleted file mode 100644 index de0a7a51..00000000 --- a/src/BuildTiles/GenOutput/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -noinst_LIBRARIES = libGenOutput.a - -libGenOutput_a_SOURCES = genobj.cxx genobj.hxx - -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/Lib \ - -I$(top_srcdir)/src/BuildTiles diff --git a/src/BuildTiles/Main/Makefile.am b/src/BuildTiles/Main/Makefile.am deleted file mode 100644 index 00ae49f6..00000000 --- a/src/BuildTiles/Main/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -bin_PROGRAMS = fgfs-construct fgfs-master - -fgfs_construct_SOURCES = \ - construct.cxx construct.hxx \ - usgs.cxx main.cxx - -dist_pkgdata_DATA = usgsmap.txt - -fgfs_construct_LDADD = \ - $(top_builddir)/src/BuildTiles/Clipper/libClipper.a \ - $(top_builddir)/src/BuildTiles/GenOutput/libGenOutput.a \ - $(top_builddir)/src/BuildTiles/Match/libMatch.a \ - $(top_builddir)/src/BuildTiles/Osgb36/libOsgb36.a \ - $(top_builddir)/src/BuildTiles/Triangulate/libTriangulate.a \ - $(top_builddir)/src/Lib/Array/libArray.a \ - $(top_builddir)/src/Lib/Geometry/libGeometry.a \ - $(top_builddir)/src/Lib/Optimize/libOptimize.a \ - $(top_builddir)/src/Lib/Output/libOutput.a \ - $(top_builddir)/src/Lib/Polygon/libPolygon.a \ - $(top_builddir)/src/Lib/landcover/liblandcover.a \ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgbucket -lsgio -lsgmath -lsgmisc -lsgdebug -lsgstructure -lsgxml \ - -lgenpolyclip -lz - -fgfs_master_SOURCES = master.cxx - -fgfs_master_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml -AM_CPPFLAGS = -DDEFAULT_USGS_MAPFILE="\"$(pkgdatadir)/usgsmap.txt\"" \ - -DDEFAULT_PRIORITIES_FILE="\"$(pkgdatadir)/default_priorities.txt\"" - -INCLUDES = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/Lib \ - -I$(top_srcdir)/src/BuildTiles - diff --git a/src/BuildTiles/Makefile.am b/src/BuildTiles/Makefile.am deleted file mode 100644 index bb819017..00000000 --- a/src/BuildTiles/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -SUBDIRS = \ - Triangulate \ - Osgb36 \ - Clipper \ - GenOutput \ - Match \ - Parallel \ - Main - diff --git a/src/BuildTiles/Match/Makefile.am b/src/BuildTiles/Match/Makefile.am deleted file mode 100644 index 6f1e86ce..00000000 --- a/src/BuildTiles/Match/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -noinst_LIBRARIES = libMatch.a - -libMatch_a_SOURCES = match.cxx match.hxx - -INCLUDES = -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles diff --git a/src/BuildTiles/Osgb36/Makefile.am b/src/BuildTiles/Osgb36/Makefile.am deleted file mode 100644 index 47510b8b..00000000 --- a/src/BuildTiles/Osgb36/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -noinst_LIBRARIES = libOsgb36.a - -libOsgb36_a_SOURCES = osgb36.cxx osgb36.hxx osgbtc.cxx osgbtc.hxx uk.cxx uk.hxx - -noinst_PROGRAMS = testosgb36 - -testosgb36_SOURCES = testosgb36.cxx osgb36.cxx - -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/Lib diff --git a/src/BuildTiles/Parallel/Makefile.am b/src/BuildTiles/Parallel/Makefile.am deleted file mode 100644 index c37de193..00000000 --- a/src/BuildTiles/Parallel/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -EXTRA_DIST=fgfs-launch-clients fgfs-launch-server genworklist.sh - -bin_PROGRAMS = fgfs-tools-server fgfs-tools-client - -fgfs_tools_server_SOURCES = server.cxx - -fgfs_tools_server_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml $(network_LIBS) - -fgfs_tools_client_SOURCES = client.cxx - -fgfs_tools_client_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml $(network_LIBS) - -INCLUDES = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/Lib \ - -I$(top_srcdir)/src/BuildTiles diff --git a/src/BuildTiles/Triangulate/Makefile.am b/src/BuildTiles/Triangulate/Makefile.am deleted file mode 100644 index f5ddfcc6..00000000 --- a/src/BuildTiles/Triangulate/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -noinst_LIBRARIES = libTriangulate.a - -libTriangulate_a_SOURCES = \ - triangle.cxx triangle.hxx \ - trieles.cxx trieles.hxx - -INCLUDES = -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles diff --git a/src/Include/Makefile.am b/src/Include/Makefile.am deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Lib/Array/Makefile.am b/src/Lib/Array/Makefile.am deleted file mode 100644 index acb41db9..00000000 --- a/src/Lib/Array/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -noinst_LIBRARIES = libArray.a - -libArray_a_SOURCES = array.cxx array.hxx - -# noinst_PROGRAMS = testarray testgts -bin_PROGRAMS = testarray - -testarray_SOURCES = testarray.cxx -testarray_LDADD = libArray.a \ - -lsgbucket -lsgmath -lsgmisc -lsgdebug -lsgxml \ - $(support_LIBS) -lz - -INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Lib/DEM/Makefile.am b/src/Lib/DEM/Makefile.am deleted file mode 100644 index 4820e20b..00000000 --- a/src/Lib/DEM/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -noinst_LIBRARIES = libDEM.a - -libDEM_a_SOURCES = dem.cxx dem.hxx - -INCLUDES = -I$(top_srcdir)/src - diff --git a/src/Lib/Geometry/Makefile.am b/src/Lib/Geometry/Makefile.am deleted file mode 100644 index 20b07e3a..00000000 --- a/src/Lib/Geometry/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -noinst_LIBRARIES = libGeometry.a - -libGeometry_a_SOURCES = \ - contour_tree.cxx contour_tree.hxx \ - line.cxx line.hxx \ - poly_support.cxx poly_support.hxx \ - rectangle.cxx rectangle.hxx \ - trinodes.cxx trinodes.hxx \ - trisegs.cxx trisegs.hxx \ - util.cxx util.hxx - -INCLUDES = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/Lib \ - -I$(top_srcdir)/src/BuildTiles diff --git a/src/Lib/HGT/Makefile.am b/src/Lib/HGT/Makefile.am deleted file mode 100644 index 5b29fe29..00000000 --- a/src/Lib/HGT/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -noinst_LIBRARIES = libHGT.a - -libHGT_a_SOURCES = hgt.cxx hgt.hxx srtmbase.cxx srtmbase.hxx - -noinst_PROGRAMS = testhgt - -testhgt_SOURCES = testhgt.cxx -testhgt_LDADD = libHGT.a \ - -lsgbucket -lsgmisc -lsgdebug -lz - -INCLUDES = -I$(top_srcdir)/src - diff --git a/src/Lib/Makefile.am b/src/Lib/Makefile.am deleted file mode 100644 index 81bbb277..00000000 --- a/src/Lib/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -EXTRA_SUBDIRS = Win32 - -SUBDIRS = \ - Array \ - DEM \ - e00 \ - Geometry \ - HGT \ - landcover \ - Optimize \ - Output \ - Polygon \ - poly2tri \ - shapelib \ - TriangleJRS \ - vpf diff --git a/src/Lib/Optimize/Makefile.am b/src/Lib/Optimize/Makefile.am deleted file mode 100644 index e6959c42..00000000 --- a/src/Lib/Optimize/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -noinst_LIBRARIES = libOptimize.a - -libOptimize_a_SOURCES = \ - genfans.cxx genfans.hxx \ - genstrips.cxx genstrips.hxx - -INCLUDES = -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles diff --git a/src/Lib/Output/Makefile.am b/src/Lib/Output/Makefile.am deleted file mode 100644 index b65f1b80..00000000 --- a/src/Lib/Output/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -noinst_LIBRARIES = libOutput.a - -libOutput_a_SOURCES = \ - output.cxx output.hxx - -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib diff --git a/src/Lib/Polygon/Makefile.am b/src/Lib/Polygon/Makefile.am deleted file mode 100644 index 4985dc48..00000000 --- a/src/Lib/Polygon/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -noinst_LIBRARIES = libPolygon.a - -libPolygon_a_SOURCES = \ - chop-bin.cxx chop.hxx \ - index.cxx index.hxx \ - names.hxx \ - polygon.cxx polygon.hxx \ - simple_clip.cxx simple_clip.hxx \ - superpoly.cxx superpoly.hxx - -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib diff --git a/src/Lib/TriangleJRS/Makefile.am b/src/Lib/TriangleJRS/Makefile.am deleted file mode 100644 index 93a4f4a0..00000000 --- a/src/Lib/TriangleJRS/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -# CPPFLAGS is a list of definitions used to compile an object code version -# of Triangle (triangle.o) to be called by another program. The file -# "triangle.h" contains detailed information on how to call triangle.o. -# -# The -DTRILIBRARY should always be used when compiling Triangle into an -# object file. -# -# An example DEFS line is: -# -# CPPFLAGS = -DTRILIBRARY -DREDUCED -DCDT_ONLY -# -# WARNING: I have had some problems compiling with -O2 (gcc) leading to -# segfaults. This problem seems to go away when I compile without -O2. -# This usually indicates some sort of bug in the source code (*very* rarely -# is it a compiler optimization bug) however this is not my code ... -# - -AM_CFLAGS = -DTRILIBRARY - -noinst_LIBRARIES = libTriangleJRS.a - -libTriangleJRS_a_SOURCES = \ - triangle.c triangle.h \ - tri_support.c tri_support.h - -if HAVE_XWINDOWS - -bin_PROGRAMS = showme -showme_SOURCES = showme.c -showme_LDADD = -lX11 - -endif - -noinst_PROGRAMS = test_triangle -test_triangle_SOURCES = test_triangle.c -test_triangle_LDADD = libTriangleJRS.a - diff --git a/src/Lib/e00/Makefile.am b/src/Lib/e00/Makefile.am deleted file mode 100644 index f08e7ad6..00000000 --- a/src/Lib/e00/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -noinst_LIBRARIES = libe00.a - -libe00_a_SOURCES = e00.cxx e00.hxx - -noinst_PROGRAMS = teste00 - -teste00_SOURCES = teste00.cxx -teste00_LDADD = libe00.a -lsgmisc -lsgdebug -lsgxml -lz - -INCLUDES = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/Lib diff --git a/src/Lib/landcover/Makefile.am b/src/Lib/landcover/Makefile.am deleted file mode 100644 index 52a496e0..00000000 --- a/src/Lib/landcover/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -noinst_LIBRARIES = liblandcover.a - -liblandcover_a_SOURCES = landcover.cxx landcover.hxx - -noinst_PROGRAMS = test-landcover - -test_landcover_SOURCES = test-landcover.cxx -test_landcover_LDADD = liblandcover.a - - diff --git a/src/Lib/poly2tri/Makefile.am b/src/Lib/poly2tri/Makefile.am deleted file mode 100644 index 034d2499..00000000 --- a/src/Lib/poly2tri/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -EXTRA_DIST = README makefile.orig data_1 - -# AM_CFLAGS = -DSTANDALONE - -noinst_LIBRARIES = libpoly2tri.a - -libpoly2tri_a_SOURCES = \ - construct.c \ - interface.h \ - misc.c \ - monotone.c \ - tri.c \ - triangulate.h - -# INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/Lib diff --git a/src/Lib/shapelib/Makefile.am b/src/Lib/shapelib/Makefile.am deleted file mode 100644 index a295f835..00000000 --- a/src/Lib/shapelib/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -EXTRA_DIST = ChangeLog dbf_api.html makeshape.sh shape.errata \ - shapelib.html shp_api.html stream1.sh stream2.sh - -noinst_LIBRARIES = libshape.a - -libshape_a_SOURCES = \ - dbfopen.c shpopen.c shapefil.h - -noinst_PROGRAMS = shpcreate shpadd shpdump \ - dbfcreate dbfadd dbfdump \ - shptest shputils - -shpcreate_SOURCES = shpcreate.c -shpcreate_LDADD = libshape.a - -shpadd_SOURCES = shpadd.c -shpadd_LDADD = libshape.a - -shpdump_SOURCES = shpdump.c -shpdump_LDADD = libshape.a - -dbfcreate_SOURCES = dbfcreate.c -dbfcreate_LDADD = libshape.a - -dbfadd_SOURCES = dbfadd.c -dbfadd_LDADD = libshape.a - -dbfdump_SOURCES = dbfdump.c -dbfdump_LDADD = libshape.a - -shptest_SOURCES = shptest.c -shptest_LDADD = libshape.a - -shputils_SOURCES = shputils.c -shputils_LDADD = libshape.a - -INCLUDES = -I$(top_srcdir)/src diff --git a/src/Lib/vpf/Makefile.am b/src/Lib/vpf/Makefile.am deleted file mode 100644 index a4db244f..00000000 --- a/src/Lib/vpf/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -noinst_LIBRARIES = libvpf.a - -libvpf_a_SOURCES = \ - component.hxx \ - coverage.hxx \ - database.hxx \ - feature.hxx \ - label.hxx \ - library.hxx \ - contour.hxx \ - line.hxx \ - polygon.hxx \ - property.hxx \ - table.hxx \ - tablemgr.hxx \ - tile.hxx \ - value.hxx \ - vpf.hxx \ - vpfbase.hxx \ - vpfbase.cxx \ - value.cxx \ - table.cxx \ - tablemgr.cxx \ - component.cxx \ - database.cxx \ - library.cxx \ - coverage.cxx \ - feature.cxx \ - line.cxx \ - contour.cxx \ - polygon.cxx \ - label.cxx \ - property.cxx \ - tile.cxx \ - vpf-summary.cxx \ - vpf-dump.cxx \ - vpf-topology.cxx - -noinst_PROGRAMS = vpf-dump vpf-topology vpf-summary - -vpf_dump_SOURCES = vpf-dump.cxx -vpf_dump_LDADD = libvpf.a - -vpf_topology_SOURCES = vpf-topology.cxx -vpf_topology_LDADD = libvpf.a - -vpf_summary_SOURCES = vpf-summary.cxx -vpf_summary_LDADD = libvpf.a - diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 151c965d..00000000 --- a/src/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -SUBDIRS = \ - Include \ - Lib \ - Prep \ - Airports \ - BuildTiles \ - Utils diff --git a/src/Prep/DemChop/Makefile.am b/src/Prep/DemChop/Makefile.am deleted file mode 100644 index d3304a93..00000000 --- a/src/Prep/DemChop/Makefile.am +++ /dev/null @@ -1,82 +0,0 @@ -#--------------------------------------------------------------------------- -# Makefile -# -# Written by Curtis Olson, started March 1999. -# -# Copyright (C) 1999 Curtis L. Olson - http://www.flightgear.org/~curt -# -# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# $Id: Makefile.am,v 1.9 2005-11-08 16:27:36 curt Exp $ -#--------------------------------------------------------------------------- - - -bin_PROGRAMS = demchop hgtchop fillvoids testassem - -if HAVE_LIBTIFF -bin_PROGRAMS+=srtmchop -endif - -demchop_SOURCES = \ - demchop.cxx point2d.hxx - -demchop_LDADD = \ - $(top_builddir)/src/Lib/DEM/libDEM.a \ - -lsgbucket -lsgmisc -lsgdebug -lsgxml -lz - $(base_LIBS) - -hgtchop_SOURCES = \ - hgtchop.cxx point2d.hxx - -hgtchop_LDADD = \ - $(top_builddir)/src/Lib/HGT/libHGT.a \ - -lsgbucket -lsgmisc -lsgdebug -lsgxml -lz - $(base_LIBS) - -if HAVE_LIBTIFF -srtmchop_SOURCES = \ - srtmchop.cxx point2d.hxx - -srtmchop_LDADD = \ - $(top_builddir)/src/Lib/HGT/libHGT.a \ - -lsgbucket -lsgmisc -lsgdebug -lsgxml -lz -ltiff - $(base_LIBS) -endif - -fillvoids_SOURCES = \ - fillvoids.cxx - -fillvoids_LDADD = \ - $(top_builddir)/src/Lib/Array/libArray.a \ - -lsgbucket -lsgmisc -lsgdebug -lsgxml -lz - $(base_LIBS) - -testassem_SOURCES = \ - testassem.cxx - -testassem_LDADD = \ - $(top_builddir)/src/Lib/Array/libArray.a \ - -lsgbucket -lsgmath -lsgmisc -lsgdebug -lsgxml -lz - $(base_LIBS) - -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib - -# We can't build this with "-O2" (optimization) since this causes a seg fault -# I haven't found a way to strip this out of the CXXFLAGS, so I'm just -# setting it to "-g" -# CXXFLAGS = -g - - -#--------------------------------------------------------------------------- diff --git a/src/Prep/DemInfo/Makefile.am b/src/Prep/DemInfo/Makefile.am deleted file mode 100644 index 4174bc1b..00000000 --- a/src/Prep/DemInfo/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -#--------------------------------------------------------------------------- -# Makefile -# -# Written by Curtis Olson, started June 1998. -# -# Copyright (C) 1998 Curtis L. Olson - http://www.flightgear.org/~curt -# -# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# $Id: Makefile.am,v 1.6 2004-11-19 22:25:51 curt Exp $ -#--------------------------------------------------------------------------- - - -bin_PROGRAMS = deminfo - -deminfo_SOURCES = \ - deminfo.cxx - -deminfo_LDADD = \ - $(top_builddir)/src/Lib/DEM/libDEM.a \ - -lsgbucket -lsgmisc -lsgdebug -lsgxml -lz \ - $(base_LIBS) - -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib - -# We can't build this with "-O2" (optimization) since this causes a seg fault -# I haven't found a way to strip this out of the CXXFLAGS, so I'm just -# setting it to "-g" -# CXXFLAGS = -g - - -#--------------------------------------------------------------------------- diff --git a/src/Prep/DemRaw2ascii/Makefile.am b/src/Prep/DemRaw2ascii/Makefile.am deleted file mode 100644 index a579ff1d..00000000 --- a/src/Prep/DemRaw2ascii/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -#--------------------------------------------------------------------------- -# Makefile -# -# Written by Curtis Olson, started February 1998. -# -# Copyright (C) 1998 Curtis L. Olson - http://www.flightgear.org/~curt -# -# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# $Id: Makefile.am,v 1.4 2004-11-19 22:25:51 curt Exp $ -#--------------------------------------------------------------------------- - - -bin_PROGRAMS = raw2ascii - -raw2ascii_SOURCES = main.cxx rawdem.c rawdem.h - -raw2ascii_LDADD = $(base_LIBS) -lsgmisc -lsgdebug - diff --git a/src/Prep/E00Lines/Makefile.am b/src/Prep/E00Lines/Makefile.am deleted file mode 100644 index 7e8392b0..00000000 --- a/src/Prep/E00Lines/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -bin_PROGRAMS = e00lines - -e00lines_SOURCES = main.cxx - -e00lines_LDADD = \ - $(top_builddir)/src/Lib/Polygon/libPolygon.a \ - $(top_builddir)/src/Lib/Geometry/libGeometry.a \ - $(top_builddir)/src/Lib/Output/libOutput.a \ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - $(top_builddir)/src/Lib/e00/libe00.a \ - -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgstructure -lsgxml \ - -lgenpolyclip -lz - -INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Prep/GDALChop/Makefile.am b/src/Prep/GDALChop/Makefile.am deleted file mode 100644 index 1ed59b53..00000000 --- a/src/Prep/GDALChop/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -#--------------------------------------------------------------------------- -# Makefile -# -# Written by Ralf Gerlich, started Nov 2007 -# -# Copyright (C) 2007 Ralf Gerlich - http://www.custom-scenery.org/ -# -# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# $Id$ -#--------------------------------------------------------------------------- - -bin_PROGRAMS = gdalchop - -gdalchop_SOURCES = \ - gdalchop.cxx - -gdalchop_CXXFLAGS=$(GDAL_CFLAGS) - -gdalchop_LDADD = \ - $(GDAL_LIBS) -lsgbucket -lsgmisc -lsgdebug -lsgxml -lz - $(base_LIBS) - -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib - -#--------------------------------------------------------------------------- diff --git a/src/Prep/GSHHS/Makefile.am b/src/Prep/GSHHS/Makefile.am deleted file mode 100644 index db961331..00000000 --- a/src/Prep/GSHHS/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -bin_PROGRAMS = gshhs debug - -gshhs_SOURCES = \ - main.cxx \ - gshhs.h \ - gshhs_split.cxx gshhs_split.hxx - -gshhs_LDADD = \ - $(top_builddir)/src/Lib/Polygon/libPolygon.a \ - $(top_builddir)/src/Lib/Geometry/libGeometry.a \ - $(top_builddir)/src/Lib/Output/libOutput.a \ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - -lsgdebug -lsgbucket -lsgmath -lsgmisc -lsgstructure -lsgxml \ - -lgenpolyclip -lz - -debug_SOURCES = \ - debug.cxx - -debug_LDADD = \ - $(top_builddir)/src/Lib/Polygon/libPolygon.a \ - $(top_builddir)/src/Lib/Geometry/libGeometry.a \ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - -lsgdebug -lsgbucket -lsgmath -lsgmisc -lsgstructure -lsgxml \ - -lgenpolyclip -lz - -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib diff --git a/src/Prep/Makefile.am b/src/Prep/Makefile.am deleted file mode 100644 index b691e89a..00000000 --- a/src/Prep/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -SUBDIRS = \ - DemChop \ - DemInfo \ - DemRaw2ascii \ - E00Lines \ - GSHHS \ - Photo \ - ShapeFile \ - TGVPF \ - Terra \ - TerraFit \ - Tower \ - UserDef - -if WANT_OGRDECODE - SUBDIRS+=OGRDecode -endif - -if WANT_GDALCHOP - SUBDIRS+=GDALChop -endif - diff --git a/src/Prep/MergerClipper/Makefile.am b/src/Prep/MergerClipper/Makefile.am deleted file mode 100644 index 557315a8..00000000 --- a/src/Prep/MergerClipper/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -noinst_LIBRARIES = libMergerClipper.a - -libMergerClipper_a_SOURCES = merger.cxx merger.hxx - -noinst_PROGRAMS = testmerger - -testmerger_SOURCES = testmerger.cxx - -testmerger_LDADD = \ - $(top_builddir)/src/Prep/MergerClipper/libMergerClipper.a \ - $(top_builddir)/src/Lib/Polygon/libPolygon.a \ - $(top_builddir)/src/Lib/Geometry/libGeometry.a \ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgdebug -lsgbucket -lsgmath -lsgmisc -lsgstructure -lsgxml \ - -lgenpolyclip -lz - -INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Prep/OGRDecode/Makefile.am b/src/Prep/OGRDecode/Makefile.am deleted file mode 100644 index 97463933..00000000 --- a/src/Prep/OGRDecode/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -bin_PROGRAMS = ogr-decode - -ogr_decode_SOURCES = ogr-decode.cxx - -ogr_decode_CXXFLAGS=$(GDAL_CFLAGS) - -ogr_decode_LDADD = \ - $(GDAL_LIBS) \ - $(top_builddir)/src/Lib/Polygon/libPolygon.a \ - $(top_builddir)/src/Lib/Geometry/libGeometry.a \ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgdebug -lsgbucket -lsgmath -lsgmisc -lsgstructure -lsgxml \ - -lgenpolyclip -lz - -INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Prep/Photo/Makefile.am b/src/Prep/Photo/Makefile.am deleted file mode 100644 index 06f67e13..00000000 --- a/src/Prep/Photo/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -#--------------------------------------------------------------------------- -# Makefile -# -# Written by Curtis Olson, started January 1998. -# -# Copyright (C) 1998 Curtis L. Olson - http://www.flightgear.org/~curt -# -# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# $Id: Makefile.am,v 1.11 2004-11-19 22:25:51 curt Exp $ -#--------------------------------------------------------------------------- - - -EXTRA_DIST = chop.pl - -bin_PROGRAMS = photo wgs84offset findcorners - -photo_SOURCES = photo.cxx - -photo_LDADD = \ - $(top_builddir)/src/Lib/Array/libArray.a \ - $(top_builddir)/src/Lib/Polygon/libPolygon.a \ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/src/Lib/Geometry/libGeometry.a \ - $(top_builddir)/src/Lib/Output/libOutput.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lsgstructure -lsgxml \ - -lgenpolyclip -lz - $(base_LIBS) - -wgs84offset_SOURCES = wgs84offset.cxx - -wgs84offset_LDADD = -lsgmath -lsgdebug -lsgstructure - -findcorners_SOURCES = findcorners.cxx - -findcorners_LDADD = -lsgmath -lsgdebug -lsgstructure - -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/Lib \ - -I$(top_srcdir)/src/BuildTiles diff --git a/src/Prep/ShapeFile/Makefile.am b/src/Prep/ShapeFile/Makefile.am deleted file mode 100644 index fc208f3f..00000000 --- a/src/Prep/ShapeFile/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -bin_PROGRAMS = shape-decode noaa-decode - -shape_decode_SOURCES = shape-decode.cxx - -noaa_decode_SOURCES = shape-decode.cxx - -LDADD = \ - $(top_builddir)/src/Lib/Polygon/libPolygon.a \ - $(top_builddir)/src/Lib/Geometry/libGeometry.a \ - $(top_builddir)/src/Lib/Output/libOutput.a \ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/src/Lib/shapelib/libshape.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgdebug -lsgbucket -lsgmath -lsgmisc -lsgstructure -lsgxml \ - -lgenpolyclip -lz - -INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Prep/TGVPF/Makefile.am b/src/Prep/TGVPF/Makefile.am deleted file mode 100644 index 720e1a48..00000000 --- a/src/Prep/TGVPF/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -bin_PROGRAMS = tgvpf - -tgvpf_SOURCES = tgvpf.cxx - -tgvpf_LDADD = \ - $(top_builddir)/src/Lib/Polygon/libPolygon.a \ - $(top_builddir)/src/Lib/Geometry/libGeometry.a \ - $(top_builddir)/src/Lib/Output/libOutput.a \ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - $(top_builddir)/src/Lib/vpf/libvpf.a \ - -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgtiming -lsgstructure -lsgxml \ - -lgenpolyclip -lz - -INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Prep/Terra/Makefile.am b/src/Prep/Terra/Makefile.am deleted file mode 100644 index c0ce4e58..00000000 --- a/src/Prep/Terra/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -EXTRA_DIST = Makefile.gcc-2.95 Makefile.orig - -# don't build xterra by default -#bin_PROGRAMS = terra xterra -bin_PROGRAMS = terra -noinst_LIBRARIES = libTerra.a - -libTerra_a_SOURCES = \ - Array.h Geom.h \ - GreedyInsert.cc GreedyInsert.h \ - Heap.cc Heap.h \ - Map.cc Map.h \ - Mask.cc Mask.h \ - Quadedge.cc Quadedge.h \ - Subdivision.cc Subdivision.h \ - Vec2.h Vec3.h - -terra_SOURCES = \ - cmdline.cc getopt.c getopt.h greedy.cc output.cc terra.cc terra.h version.h - -terra_LDADD = libTerra.a - - -#xterra_SOURCES = \ -# cmdline.cc glHacks.cc glHacks.h greedy.cc gui.cc gui.h \ -# output.cc terra.h version.h xterra.cc -# -#xterra_LDADD = $(opengl_LIBS) libTerra.a diff --git a/src/Prep/TerraFit/Makefile.am b/src/Prep/TerraFit/Makefile.am deleted file mode 100644 index 548eda57..00000000 --- a/src/Prep/TerraFit/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -bin_SCRIPTS = terrafit.py -bin_PROGRAMS = terrafit - -terrafit_SOURCES = terrafit.cc -terrafit_LDADD = $(top_builddir)/src/Prep/Terra/libTerra.a \ - $(top_builddir)/src/Lib/Array/libArray.a \ - -lsgbucket -lsgstructure -lsgmisc -lsgdebug -lz - -EXTRA_DIST = terrafit.README terrafit.py.in - -terrafit.py: $(srcdir)/terrafit.py.in - echo ${bindir} - sed -e "s%__bindir__%${bindir}%g" $(srcdir)/terrafit.py.in > terrafit.py - -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib diff --git a/src/Prep/Tower/Makefile.am b/src/Prep/Tower/Makefile.am deleted file mode 100644 index 62ff8ee2..00000000 --- a/src/Prep/Tower/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = calc-tile.pl tower.pl diff --git a/src/Prep/UserDef/Makefile.am b/src/Prep/UserDef/Makefile.am deleted file mode 100644 index 782a5ee0..00000000 --- a/src/Prep/UserDef/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -bin_PROGRAMS = tguserdef - -tguserdef_SOURCES = tguserdef.cxx - -tguserdef_LDADD = \ - $(top_builddir)/src/Lib/Polygon/libPolygon.a \ - $(top_builddir)/src/Lib/Geometry/libGeometry.a \ - $(top_builddir)/src/Lib/Output/libOutput.a \ - $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ - $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ - -lsgbucket -lsgmath -lsgprops -lsgmisc -lsgio -lsgstructure -lsgxml \ - -lsgdebug \ - -lOpenThreads \ - -lgenpolyclip -lz - -INCLUDES = -I$(top_srcdir)/src/Lib diff --git a/src/Utils/Makefile.am b/src/Utils/Makefile.am deleted file mode 100644 index 804fe798..00000000 --- a/src/Utils/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -EXTRA_DIST = mirror-dem - -SUBDIRS = \ - cdrom \ - download-map - -if WANT_POLY2OGR -SUBDIRS+=poly2ogr -endif - diff --git a/src/Utils/cdrom/Makefile.am b/src/Utils/cdrom/Makefile.am deleted file mode 100644 index a515abeb..00000000 --- a/src/Utils/cdrom/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -EXTRA_DIST = \ - 1-gen-layout-map.pl \ - 2-make-layout-link-tree.pl \ - 3-make-cdrom-image \ - 3-make-dvd-image \ - sum-new-sizes.pl diff --git a/src/Utils/download-map/Makefile.am b/src/Utils/download-map/Makefile.am deleted file mode 100644 index c43c79a3..00000000 --- a/src/Utils/download-map/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = earth_2400.jpg rawmap.gif download-map.pl diff --git a/src/Utils/poly2ogr/Makefile.am b/src/Utils/poly2ogr/Makefile.am deleted file mode 100644 index 711303c7..00000000 --- a/src/Utils/poly2ogr/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -bin_PROGRAMS = poly2ogr - -poly2ogr_SOURCES = poly2ogr.cxx -poly2ogr_CXXFLAGS=$(GDAL_CFLAGS) -poly2ogr_LDADD = \ - $(GDAL_LIBS) \ - $(top_builddir)/src/Lib/Polygon/libPolygon.a \ - -lsgio -lsgbucket -lsgmath -lsgstructure -lsgmisc -lsgdebug -lz - -INCLUDES = -I$(top_srcdir)/src/Lib