Changed directory structure a bit to facilitate building for windows.
This commit is contained in:
parent
68a19bd39f
commit
82f410e955
@ -3,4 +3,4 @@ EXTRA_DIST = mksymlinks.sh acsite.m4 acconfig.h
|
||||
dist-hook:
|
||||
tar cf - src/metar | (cd $(distdir); tar xvf -)
|
||||
|
||||
SUBDIRS = src
|
||||
SUBDIRS = simgear
|
||||
|
28
configure.in
28
configure.in
@ -3,7 +3,7 @@ dnl working configure script.
|
||||
dnl
|
||||
dnl $Id$
|
||||
|
||||
AC_INIT(src/bucket/newbucket.cxx)
|
||||
AC_INIT(simgear/bucket/newbucket.cxx)
|
||||
|
||||
dnl Initialize the automake stuff
|
||||
AM_INIT_AUTOMAKE(SimGear, 0.0.4)
|
||||
@ -223,24 +223,24 @@ 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)
|
||||
AM_CONFIG_HEADER(simgear/include/config.h)
|
||||
|
||||
AC_OUTPUT( \
|
||||
Makefile \
|
||||
src/Makefile \
|
||||
src/include/Makefile \
|
||||
src/include/version.h \
|
||||
src/bucket/Makefile \
|
||||
src/debug/Makefile \
|
||||
src/math/Makefile \
|
||||
src/misc/Makefile \
|
||||
src/screen/Makefile \
|
||||
src/serial/Makefile \
|
||||
src/xgl/Makefile \
|
||||
src/zlib/Makefile \
|
||||
simgear/Makefile \
|
||||
simgear/include/Makefile \
|
||||
simgear/include/version.h \
|
||||
simgear/bucket/Makefile \
|
||||
simgear/debug/Makefile \
|
||||
simgear/math/Makefile \
|
||||
simgear/misc/Makefile \
|
||||
simgear/screen/Makefile \
|
||||
simgear/serial/Makefile \
|
||||
simgear/xgl/Makefile \
|
||||
simgear/zlib/Makefile \
|
||||
)
|
||||
|
||||
AC_OUTPUT_COMMANDS([./mksymlinks.sh])
|
||||
# AC_OUTPUT_COMMANDS([./mksymlinks.sh])
|
||||
|
||||
echo ""
|
||||
echo "Configure Summary"
|
||||
|
@ -29,7 +29,6 @@ ln -s ../../debug/logstream.hxx src/simgear/debug/logstream.hxx
|
||||
|
||||
ln -s ../../math/fg_memory.h src/simgear/math/fg_memory.h
|
||||
ln -s ../../math/fg_types.hxx src/simgear/math/fg_types.hxx
|
||||
ln -s ../../math/mat3.h src/simgear/math/mat3.h
|
||||
ln -s ../../math/point3d.hxx src/simgear/math/point3d.hxx
|
||||
ln -s ../../math/polar3d.hxx src/simgear/math/polar3d.hxx
|
||||
|
||||
|
@ -14,4 +14,4 @@ libsgbucket_a_SOURCES = newbucket.cxx
|
||||
# $(top_builddir)/bucket/libsgbucket.a \
|
||||
# $(top_builddir)/misc/libsgmisc.a
|
||||
|
||||
INCLUDES += -I$(top_builddir)/src
|
||||
# INCLUDES += -I$(top_builddir)/src
|
||||
|
@ -8,4 +8,4 @@ include_HEADERS = debug_types.h logstream.hxx
|
||||
|
||||
libsgdebug_a_SOURCES = logstream.cxx
|
||||
|
||||
INCLUDES += -I$(top_builddir)/src
|
||||
# INCLUDES += -I$(top_builddir)/src
|
||||
|
@ -29,4 +29,5 @@ libsgmath_a_SOURCES = \
|
||||
polar3d.cxx \
|
||||
vector.cxx
|
||||
|
||||
INCLUDES += -I$(top_builddir)/src $(ZLIB_INCL)
|
||||
# INCLUDES += -I$(top_builddir)/src $(ZLIB_INCL)
|
||||
INCLUDES += $(ZLIB_INCL)
|
||||
|
@ -9,4 +9,4 @@ libsgmetar_a_SOURCES = \
|
||||
MetarStation.cpp MetarStation.h \
|
||||
Prtdmetr.cpp Stspack2.cpp Stspack3.cpp
|
||||
|
||||
INCLUDES += -I$(top_builddir)
|
||||
# INCLUDES += -I$(top_builddir)
|
||||
|
@ -23,4 +23,5 @@ libsgmisc_a_SOURCES = \
|
||||
texcoord.cxx \
|
||||
zfstream.cxx
|
||||
|
||||
INCLUDES += -I$(top_builddir)/src $(ZLIB_INCL)
|
||||
# INCLUDES += -I$(top_builddir)/src $(ZLIB_INCL)
|
||||
INCLUDES += $(ZLIB_INCL)
|
||||
|
@ -9,4 +9,4 @@ libsgscreen_a_SOURCES = \
|
||||
screen-dump.cxx \
|
||||
win32-printer.h
|
||||
|
||||
INCLUDES += -I$(top_builddir)/src
|
||||
# INCLUDES += -I$(top_builddir)/src
|
||||
|
@ -11,7 +11,7 @@ libsgserial_a_SOURCES = serial.cxx
|
||||
testserial_SOURCES = testserial.cxx
|
||||
|
||||
testserial_LDADD = \
|
||||
$(top_builddir)/src/serial/libsgserial.a \
|
||||
$(top_builddir)/src/debug/libsgdebug.a
|
||||
$(top_builddir)/simgear/serial/libsgserial.a \
|
||||
$(top_builddir)/simgear/debug/libsgdebug.a
|
||||
|
||||
INCLUDES += -I$(top_builddir)/src
|
||||
# INCLUDES += -I$(top_builddir)/simgear
|
||||
|
@ -6,4 +6,4 @@ include_HEADERS = xgl.h
|
||||
|
||||
libsgxgl_a_SOURCES = xgl.c xglUtils.c
|
||||
|
||||
INCLUDES += -I$(top_builddir)
|
||||
# INCLUDES += -I$(top_builddir)
|
||||
|
Loading…
Reference in New Issue
Block a user