From 82f410e9559fc33cb87515c0659d5f24115d1386 Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 17 Mar 2000 22:12:16 +0000 Subject: [PATCH] Changed directory structure a bit to facilitate building for windows. --- Makefile.am | 2 +- configure.in | 28 ++++++++++++++-------------- mksymlinks.sh | 1 - simgear/bucket/Makefile.am | 2 +- simgear/debug/Makefile.am | 2 +- simgear/math/Makefile.am | 3 ++- simgear/metar/Makefile.am | 2 +- simgear/misc/Makefile.am | 3 ++- simgear/screen/Makefile.am | 2 +- simgear/serial/Makefile.am | 6 +++--- simgear/xgl/Makefile.am | 2 +- 11 files changed, 27 insertions(+), 26 deletions(-) diff --git a/Makefile.am b/Makefile.am index a7590db7..97fc99ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/configure.in b/configure.in index 80a230d6..2079f694 100644 --- a/configure.in +++ b/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" diff --git a/mksymlinks.sh b/mksymlinks.sh index 8ff39f1c..311f8a9f 100755 --- a/mksymlinks.sh +++ b/mksymlinks.sh @@ -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 diff --git a/simgear/bucket/Makefile.am b/simgear/bucket/Makefile.am index d2cc1883..8ebce7bf 100644 --- a/simgear/bucket/Makefile.am +++ b/simgear/bucket/Makefile.am @@ -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 diff --git a/simgear/debug/Makefile.am b/simgear/debug/Makefile.am index 255f0252..fcf0bcd4 100644 --- a/simgear/debug/Makefile.am +++ b/simgear/debug/Makefile.am @@ -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 diff --git a/simgear/math/Makefile.am b/simgear/math/Makefile.am index 7af97079..765e64e8 100644 --- a/simgear/math/Makefile.am +++ b/simgear/math/Makefile.am @@ -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) diff --git a/simgear/metar/Makefile.am b/simgear/metar/Makefile.am index cbe88c79..c0457eb1 100644 --- a/simgear/metar/Makefile.am +++ b/simgear/metar/Makefile.am @@ -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) diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am index 44d4a796..8c0d900c 100644 --- a/simgear/misc/Makefile.am +++ b/simgear/misc/Makefile.am @@ -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) diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am index 4593565d..9bd749b1 100644 --- a/simgear/screen/Makefile.am +++ b/simgear/screen/Makefile.am @@ -9,4 +9,4 @@ libsgscreen_a_SOURCES = \ screen-dump.cxx \ win32-printer.h -INCLUDES += -I$(top_builddir)/src +# INCLUDES += -I$(top_builddir)/src diff --git a/simgear/serial/Makefile.am b/simgear/serial/Makefile.am index c92c1fc4..177dc6c4 100644 --- a/simgear/serial/Makefile.am +++ b/simgear/serial/Makefile.am @@ -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 diff --git a/simgear/xgl/Makefile.am b/simgear/xgl/Makefile.am index 3b976153..f0a2dda0 100644 --- a/simgear/xgl/Makefile.am +++ b/simgear/xgl/Makefile.am @@ -6,4 +6,4 @@ include_HEADERS = xgl.h libsgxgl_a_SOURCES = xgl.c xglUtils.c -INCLUDES += -I$(top_builddir) +# INCLUDES += -I$(top_builddir) -- 2.39.2