Restructuring subdirectories.
This commit is contained in:
curt
30
Makefile.am
30
Makefile.am
@@ -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
|
||||
|
||||
dist-hook:
|
||||
tar cf - metar | (cd $(distdir); tar xvf -)
|
||||
|
||||
SUBDIRS = \
|
||||
include \
|
||||
bucket \
|
||||
debug \
|
||||
math \
|
||||
$(METAR_DIRS) \
|
||||
misc \
|
||||
screen \
|
||||
$(SERIAL_DIRS) \
|
||||
xgl \
|
||||
$(ZLIB_DIRS)
|
||||
tar cf - src/metar | (cd $(distdir); tar xvf -)
|
||||
|
||||
SUBDIRS = src
|
||||
|
||||
48
configure
vendored
48
configure
vendored
@@ -456,7 +456,7 @@ echo > confdefs.h
|
||||
|
||||
# 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.
|
||||
ac_unique_file=bucket/newbucket.cxx
|
||||
ac_unique_file=src/bucket/newbucket.cxx
|
||||
|
||||
# Find the source files, if location was not specified.
|
||||
if test -z "$srcdir"; then
|
||||
@@ -694,7 +694,7 @@ fi
|
||||
|
||||
PACKAGE=SimGear
|
||||
|
||||
VERSION=0.0.0
|
||||
VERSION=0.0.1
|
||||
|
||||
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; }
|
||||
@@ -3949,16 +3949,17 @@ ac_given_INSTALL="$INSTALL"
|
||||
trap 'rm -fr `echo "\
|
||||
VERSION \
|
||||
Makefile \
|
||||
include/Makefile \
|
||||
bucket/Makefile \
|
||||
debug/Makefile \
|
||||
math/Makefile \
|
||||
misc/Makefile \
|
||||
screen/Makefile \
|
||||
serial/Makefile \
|
||||
xgl/Makefile \
|
||||
zlib/Makefile \
|
||||
include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
|
||||
src/Makefile \
|
||||
src/include/Makefile \
|
||||
src/bucket/Makefile \
|
||||
src/debug/Makefile \
|
||||
src/math/Makefile \
|
||||
src/misc/Makefile \
|
||||
src/screen/Makefile \
|
||||
src/serial/Makefile \
|
||||
src/xgl/Makefile \
|
||||
src/zlib/Makefile \
|
||||
src/include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
|
||||
EOF
|
||||
cat >> $CONFIG_STATUS <<EOF
|
||||
|
||||
@@ -4062,15 +4063,16 @@ cat >> $CONFIG_STATUS <<EOF
|
||||
CONFIG_FILES=\${CONFIG_FILES-"\
|
||||
VERSION \
|
||||
Makefile \
|
||||
include/Makefile \
|
||||
bucket/Makefile \
|
||||
debug/Makefile \
|
||||
math/Makefile \
|
||||
misc/Makefile \
|
||||
screen/Makefile \
|
||||
serial/Makefile \
|
||||
xgl/Makefile \
|
||||
zlib/Makefile \
|
||||
src/Makefile \
|
||||
src/include/Makefile \
|
||||
src/bucket/Makefile \
|
||||
src/debug/Makefile \
|
||||
src/math/Makefile \
|
||||
src/misc/Makefile \
|
||||
src/screen/Makefile \
|
||||
src/serial/Makefile \
|
||||
src/xgl/Makefile \
|
||||
src/zlib/Makefile \
|
||||
"}
|
||||
EOF
|
||||
cat >> $CONFIG_STATUS <<\EOF
|
||||
@@ -4152,7 +4154,7 @@ ac_eD='%g'
|
||||
if test "${CONFIG_HEADERS+set}" != set; then
|
||||
EOF
|
||||
cat >> $CONFIG_STATUS <<EOF
|
||||
CONFIG_HEADERS="include/config.h"
|
||||
CONFIG_HEADERS="src/include/config.h"
|
||||
EOF
|
||||
cat >> $CONFIG_STATUS <<\EOF
|
||||
fi
|
||||
@@ -4243,7 +4245,7 @@ cat >> $CONFIG_STATUS <<EOF
|
||||
|
||||
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
|
||||
EOF
|
||||
|
||||
25
configure.in
25
configure.in
@@ -3,10 +3,10 @@ dnl working configure script.
|
||||
dnl
|
||||
dnl $Id$
|
||||
|
||||
AC_INIT(bucket/newbucket.cxx)
|
||||
AC_INIT(src/bucket/newbucket.cxx)
|
||||
|
||||
dnl Initialize the automake stuff
|
||||
AM_INIT_AUTOMAKE(SimGear, 0.0.0)
|
||||
AM_INIT_AUTOMAKE(SimGear, 0.0.1)
|
||||
|
||||
dnl Checks for programs.
|
||||
AC_PROG_MAKE_SET
|
||||
@@ -221,20 +221,21 @@ AC_FUNC_VPRINTF
|
||||
AC_CHECK_FUNCS( ftime gettimeofday timegm memcpy bcopy mktime strstr rand \
|
||||
random setitimer getitimer signal GetLocalTime rint getrusage )
|
||||
|
||||
AM_CONFIG_HEADER(include/config.h)
|
||||
AM_CONFIG_HEADER(src/include/config.h)
|
||||
|
||||
AC_OUTPUT( \
|
||||
VERSION \
|
||||
Makefile \
|
||||
include/Makefile \
|
||||
bucket/Makefile \
|
||||
debug/Makefile \
|
||||
math/Makefile \
|
||||
misc/Makefile \
|
||||
screen/Makefile \
|
||||
serial/Makefile \
|
||||
xgl/Makefile \
|
||||
zlib/Makefile \
|
||||
src/Makefile \
|
||||
src/include/Makefile \
|
||||
src/bucket/Makefile \
|
||||
src/debug/Makefile \
|
||||
src/math/Makefile \
|
||||
src/misc/Makefile \
|
||||
src/screen/Makefile \
|
||||
src/serial/Makefile \
|
||||
src/xgl/Makefile \
|
||||
src/zlib/Makefile \
|
||||
)
|
||||
|
||||
AC_OUTPUT_COMMANDS([./mksymlinks.sh])
|
||||
|
||||
@@ -4,22 +4,23 @@ echo ""
|
||||
echo "running $0 to rebuild simgear include links"
|
||||
|
||||
# toast the old directory
|
||||
rm -rf simgear
|
||||
mkdir simgear
|
||||
rm -rf src/simgear
|
||||
mkdir src/simgear
|
||||
|
||||
# build new links
|
||||
ln -s ../include/compiler.h simgear/compiler.h
|
||||
ln -s ../include/constants.h simgear/constants.h
|
||||
ln -s ../debug/debug_types.h simgear/debug_types.h
|
||||
ln -s ../math/fg_memory.h simgear/fg_memory.h
|
||||
ln -s ../include/fg_traits.hxx simgear/fg_traits.hxx
|
||||
ln -s ../math/fg_types.hxx simgear/fg_types.hxx
|
||||
ln -s ../include/fg_zlib.h simgear/fg_zlib.h
|
||||
ln -s ../misc/fgpath.hxx simgear/fgpath.hxx
|
||||
ln -s ../debug/logstream.hxx simgear/logstream.hxx
|
||||
ln -s ../math/mat3.h simgear/mat3.h
|
||||
ln -s ../bucket/newbucket.hxx simgear/newbucket.hxx
|
||||
ln -s ../math/point3d.hxx simgear/point3d.hxx
|
||||
ln -s ../math/polar3d.hxx simgear/polar3d.hxx
|
||||
ln -s ../xgl/xgl.h simgear/xgl.h
|
||||
ln -s ../misc/zfstream.hxx simgear/zfstream.hxx
|
||||
ln -s ../include/compiler.h src/simgear/compiler.h
|
||||
ln -s ../include/constants.h src/simgear/constants.h
|
||||
ln -s ../debug/debug_types.h src/simgear/debug_types.h
|
||||
ln -s ../math/fg_memory.h src/simgear/fg_memory.h
|
||||
ln -s ../include/fg_traits.hxx src/simgear/fg_traits.hxx
|
||||
ln -s ../math/fg_types.hxx src/simgear/fg_types.hxx
|
||||
ln -s ../include/fg_zlib.h src/simgear/fg_zlib.h
|
||||
ln -s ../misc/fgpath.hxx src/simgear/fgpath.hxx
|
||||
ln -s ../misc/fgstream.hxx src/simgear/fgstream.hxx
|
||||
ln -s ../debug/logstream.hxx src/simgear/logstream.hxx
|
||||
ln -s ../math/mat3.h src/simgear/mat3.h
|
||||
ln -s ../bucket/newbucket.hxx src/simgear/newbucket.hxx
|
||||
ln -s ../math/point3d.hxx src/simgear/point3d.hxx
|
||||
ln -s ../math/polar3d.hxx src/simgear/polar3d.hxx
|
||||
ln -s ../xgl/xgl.h src/simgear/xgl.h
|
||||
ln -s ../misc/zfstream.hxx src/simgear/zfstream.hxx
|
||||
|
||||
@@ -12,4 +12,4 @@ libsgbucket_a_SOURCES = newbucket.cxx
|
||||
# $(top_builddir)/bucket/libsgbucket.a \
|
||||
# $(top_builddir)/misc/libsgmisc.a
|
||||
|
||||
INCLUDES += -I$(top_builddir)
|
||||
INCLUDES += -I$(top_builddir)/src
|
||||
|
||||
@@ -6,4 +6,4 @@ include_HEADERS = debug_types.h logstream.hxx
|
||||
|
||||
libsgdebug_a_SOURCES = logstream.cxx
|
||||
|
||||
INCLUDES += -I$(top_builddir)
|
||||
INCLUDES += -I$(top_builddir)/src
|
||||
|
||||
@@ -27,4 +27,4 @@ libsgmath_a_SOURCES = \
|
||||
polar3d.cxx \
|
||||
vector.cxx
|
||||
|
||||
INCLUDES += -I$(top_builddir)
|
||||
INCLUDES += -I$(top_builddir)/src
|
||||
|
||||
@@ -23,8 +23,4 @@ libsgmisc_a_SOURCES = \
|
||||
texcoord.cxx \
|
||||
zfstream.cxx
|
||||
|
||||
INCLUDES += \
|
||||
-I$(top_builddir) \
|
||||
-I$(top_builddir)/bucket \
|
||||
-I$(top_builddir)/math \
|
||||
$(ZLIB_INCL)
|
||||
INCLUDES += -I$(top_builddir)/src
|
||||
|
||||
@@ -7,4 +7,4 @@ libsgscreen_a_SOURCES = \
|
||||
screen-dump.cxx \
|
||||
win32-printer.h
|
||||
|
||||
INCLUDES += -I$(top_builddir)
|
||||
INCLUDES += -I$(top_builddir)/src
|
||||
|
||||
@@ -9,7 +9,7 @@ libsgserial_a_SOURCES = serial.cxx
|
||||
testserial_SOURCES = testserial.cxx
|
||||
|
||||
testserial_LDADD = \
|
||||
$(top_builddir)/serial/libsgserial.a \
|
||||
$(top_builddir)/debug/libsgdebug.a
|
||||
$(top_builddir)/src/serial/libsgserial.a \
|
||||
$(top_builddir)/src/debug/libsgdebug.a
|
||||
|
||||
INCLUDES += -I$(top_builddir)
|
||||
INCLUDES += -I$(top_builddir)/src
|
||||
|
||||
Reference in New Issue
Block a user