FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restructuring subdirectories.

Browse Source
This commit is contained in:
curt
2000-02-14 17:37:54 +00:00
parent 49d6f93d8b
commit 0d8ae0cabe
10 changed files with 66 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+2 -28
View File
@@ -1,32 +1,6 @@
if ENABLE_UNIX_SERIAL
SERIAL_DIRS = serial
else
SERIAL_DIRS =
endif
if HAVE_ZLIB
ZLIB_DIRS =
else
ZLIB_DIRS = zlib
endif
METAR_DIRS =
# METAR_DIRS = metar
EXTRA_DIST = mksymlinks.sh EXTRA_DIST = mksymlinks.sh
dist-hook: dist-hook:
tar cf - metar | (cd $(distdir); tar xvf -) tar cf - src/metar | (cd $(distdir); tar xvf -)
SUBDIRS = \
include \
bucket \
debug \
math \
$(METAR_DIRS) \
misc \
screen \
$(SERIAL_DIRS) \
xgl \
$(ZLIB_DIRS)
SUBDIRS = src
configure
Vendored
+25 -23
View File
@@ -456,7 +456,7 @@ echo > confdefs.h
# A filename unique to this package, relative to the directory that # A filename unique to this package, relative to the directory that
# configure is in, which we can look for to find out if srcdir is correct. # configure is in, which we can look for to find out if srcdir is correct.
ac_unique_file=bucket/newbucket.cxx ac_unique_file=src/bucket/newbucket.cxx
# Find the source files, if location was not specified. # Find the source files, if location was not specified.
if test -z "$srcdir"; then if test -z "$srcdir"; then
@@ -694,7 +694,7 @@ fi
PACKAGE=SimGear PACKAGE=SimGear
VERSION=0.0.0 VERSION=0.0.1
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -3949,16 +3949,17 @@ ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "\ trap 'rm -fr `echo "\
VERSION \ VERSION \
Makefile \ Makefile \
include/Makefile \ src/Makefile \
bucket/Makefile \ src/include/Makefile \
debug/Makefile \ src/bucket/Makefile \
math/Makefile \ src/debug/Makefile \
misc/Makefile \ src/math/Makefile \
screen/Makefile \ src/misc/Makefile \
serial/Makefile \ src/screen/Makefile \
xgl/Makefile \ src/serial/Makefile \
zlib/Makefile \ src/xgl/Makefile \
include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 src/zlib/Makefile \
src/include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
@@ -4062,15 +4063,16 @@ cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"\ CONFIG_FILES=\${CONFIG_FILES-"\
VERSION \ VERSION \
Makefile \ Makefile \
include/Makefile \ src/Makefile \
bucket/Makefile \ src/include/Makefile \
debug/Makefile \ src/bucket/Makefile \
math/Makefile \ src/debug/Makefile \
misc/Makefile \ src/math/Makefile \
screen/Makefile \ src/misc/Makefile \
serial/Makefile \ src/screen/Makefile \
xgl/Makefile \ src/serial/Makefile \
zlib/Makefile \ src/xgl/Makefile \
src/zlib/Makefile \
"} "}
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
@@ -4152,7 +4154,7 @@ ac_eD='%g'
if test "${CONFIG_HEADERS+set}" != set; then if test "${CONFIG_HEADERS+set}" != set; then
EOF EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
CONFIG_HEADERS="include/config.h" CONFIG_HEADERS="src/include/config.h"
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
fi fi
@@ -4243,7 +4245,7 @@ cat >> $CONFIG_STATUS <<EOF
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
test -z "$CONFIG_HEADERS" || echo timestamp > include/stamp-h test -z "$CONFIG_HEADERS" || echo timestamp > src/include/stamp-h
exit 0 exit 0
EOF EOF
configure.in
+13 -12
View File
@@ -3,10 +3,10 @@ dnl working configure script.
dnl dnl
dnl $Id$ dnl $Id$
AC_INIT(bucket/newbucket.cxx) AC_INIT(src/bucket/newbucket.cxx)
dnl Initialize the automake stuff dnl Initialize the automake stuff
AM_INIT_AUTOMAKE(SimGear, 0.0.0) AM_INIT_AUTOMAKE(SimGear, 0.0.1)
dnl Checks for programs. dnl Checks for programs.
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
@@ -221,20 +221,21 @@ AC_FUNC_VPRINTF
AC_CHECK_FUNCS( ftime gettimeofday timegm memcpy bcopy mktime strstr rand \ AC_CHECK_FUNCS( ftime gettimeofday timegm memcpy bcopy mktime strstr rand \
random setitimer getitimer signal GetLocalTime rint getrusage ) random setitimer getitimer signal GetLocalTime rint getrusage )
AM_CONFIG_HEADER(include/config.h) AM_CONFIG_HEADER(src/include/config.h)
AC_OUTPUT( \ AC_OUTPUT( \
VERSION \ VERSION \
Makefile \ Makefile \
include/Makefile \ src/Makefile \
bucket/Makefile \ src/include/Makefile \
debug/Makefile \ src/bucket/Makefile \
math/Makefile \ src/debug/Makefile \
misc/Makefile \ src/math/Makefile \
screen/Makefile \ src/misc/Makefile \
serial/Makefile \ src/screen/Makefile \
xgl/Makefile \ src/serial/Makefile \
zlib/Makefile \ src/xgl/Makefile \
src/zlib/Makefile \
) )
AC_OUTPUT_COMMANDS([./mksymlinks.sh]) AC_OUTPUT_COMMANDS([./mksymlinks.sh])
mksymlinks.sh
+18 -17
View File
@@ -4,22 +4,23 @@ echo ""
echo "running $0 to rebuild simgear include links" echo "running $0 to rebuild simgear include links"
# toast the old directory # toast the old directory
rm -rf simgear rm -rf src/simgear
mkdir simgear mkdir src/simgear
# build new links # build new links
ln -s ../include/compiler.h simgear/compiler.h ln -s ../include/compiler.h src/simgear/compiler.h
ln -s ../include/constants.h simgear/constants.h ln -s ../include/constants.h src/simgear/constants.h
ln -s ../debug/debug_types.h simgear/debug_types.h ln -s ../debug/debug_types.h src/simgear/debug_types.h
ln -s ../math/fg_memory.h simgear/fg_memory.h ln -s ../math/fg_memory.h src/simgear/fg_memory.h
ln -s ../include/fg_traits.hxx simgear/fg_traits.hxx ln -s ../include/fg_traits.hxx src/simgear/fg_traits.hxx
ln -s ../math/fg_types.hxx simgear/fg_types.hxx ln -s ../math/fg_types.hxx src/simgear/fg_types.hxx
ln -s ../include/fg_zlib.h simgear/fg_zlib.h ln -s ../include/fg_zlib.h src/simgear/fg_zlib.h
ln -s ../misc/fgpath.hxx simgear/fgpath.hxx ln -s ../misc/fgpath.hxx src/simgear/fgpath.hxx
ln -s ../debug/logstream.hxx simgear/logstream.hxx ln -s ../misc/fgstream.hxx src/simgear/fgstream.hxx
ln -s ../math/mat3.h simgear/mat3.h ln -s ../debug/logstream.hxx src/simgear/logstream.hxx
ln -s ../bucket/newbucket.hxx simgear/newbucket.hxx ln -s ../math/mat3.h src/simgear/mat3.h
ln -s ../math/point3d.hxx simgear/point3d.hxx ln -s ../bucket/newbucket.hxx src/simgear/newbucket.hxx
ln -s ../math/polar3d.hxx simgear/polar3d.hxx ln -s ../math/point3d.hxx src/simgear/point3d.hxx
ln -s ../xgl/xgl.h simgear/xgl.h ln -s ../math/polar3d.hxx src/simgear/polar3d.hxx
ln -s ../misc/zfstream.hxx simgear/zfstream.hxx ln -s ../xgl/xgl.h src/simgear/xgl.h
ln -s ../misc/zfstream.hxx src/simgear/zfstream.hxx
simgear/bucket/Makefile.am
+1 -1
View File
@@ -12,4 +12,4 @@ libsgbucket_a_SOURCES = newbucket.cxx
# $(top_builddir)/bucket/libsgbucket.a \ # $(top_builddir)/bucket/libsgbucket.a \
# $(top_builddir)/misc/libsgmisc.a # $(top_builddir)/misc/libsgmisc.a
INCLUDES += -I$(top_builddir) INCLUDES += -I$(top_builddir)/src
simgear/debug/Makefile.am
+1 -1
View File
@@ -6,4 +6,4 @@ include_HEADERS = debug_types.h logstream.hxx
libsgdebug_a_SOURCES = logstream.cxx libsgdebug_a_SOURCES = logstream.cxx
INCLUDES += -I$(top_builddir) INCLUDES += -I$(top_builddir)/src
simgear/math/Makefile.am
+1 -1
View File
@@ -27,4 +27,4 @@ libsgmath_a_SOURCES = \
polar3d.cxx \ polar3d.cxx \
vector.cxx vector.cxx
INCLUDES += -I$(top_builddir) INCLUDES += -I$(top_builddir)/src
simgear/misc/Makefile.am
+1 -5
View File
@@ -23,8 +23,4 @@ libsgmisc_a_SOURCES = \
texcoord.cxx \ texcoord.cxx \
zfstream.cxx zfstream.cxx
INCLUDES += \ INCLUDES += -I$(top_builddir)/src
-I$(top_builddir) \
-I$(top_builddir)/bucket \
-I$(top_builddir)/math \
$(ZLIB_INCL)
simgear/screen/Makefile.am
+1 -1
View File
@@ -7,4 +7,4 @@ libsgscreen_a_SOURCES = \
screen-dump.cxx \ screen-dump.cxx \
win32-printer.h win32-printer.h
INCLUDES += -I$(top_builddir) INCLUDES += -I$(top_builddir)/src
simgear/serial/Makefile.am
+3 -3
View File
@@ -9,7 +9,7 @@ libsgserial_a_SOURCES = serial.cxx
testserial_SOURCES = testserial.cxx testserial_SOURCES = testserial.cxx
testserial_LDADD = \ testserial_LDADD = \
$(top_builddir)/serial/libsgserial.a \ $(top_builddir)/src/serial/libsgserial.a \
$(top_builddir)/debug/libsgdebug.a $(top_builddir)/src/debug/libsgdebug.a
INCLUDES += -I$(top_builddir) INCLUDES += -I$(top_builddir)/src