fly/flightgear
1
0
Fork 0
Code Activity

Code reorganizations. Added a Lib/ directory for more general libraries.

Browse source
This commit is contained in:
curt 1998-04-14 02:25:54 +00:00
parent 8deb5c5804
commit cd7233754f
24 changed files with 129 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
AssemTris/Makefile.am
View file

@ -29,13 +29,16 @@ bin_PROGRAMS = assemtris
assemtris_SOURCES = assemtris.c assemtris.h assemtris_SOURCES = assemtris.c assemtris.h
assemtris_LDADD = \ assemtris_LDADD = \
$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la $(top_builddir)/Lib/Bucket/libBucket.la
INCLUDES += -I../../Simulator INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.2 1998/04/14 02:25:59 curt
# Code reorganizations. Added a Lib/ directory for more general libraries.
#
# Revision 1.1 1998/04/08 22:54:57 curt # Revision 1.1 1998/04/08 22:54:57 curt
# Adopted Gnu automake/autoconf system. # Adopted Gnu automake/autoconf system.
# #

14
AssemTris/Makefile.in
View file

@ -101,14 +101,14 @@ bin_PROGRAMS = assemtris
assemtris_SOURCES = assemtris.c assemtris.h assemtris_SOURCES = assemtris.c assemtris.h
assemtris_LDADD = \ assemtris_LDADD = \
$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la $(top_builddir)/Lib/Bucket/libBucket.la
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -117,8 +117,7 @@ X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
assemtris_OBJECTS = assemtris.o assemtris_OBJECTS = assemtris.o
assemtris_DEPENDENCIES = \ assemtris_DEPENDENCIES = $(top_builddir)/Lib/Bucket/libBucket.la
$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la
assemtris_LDFLAGS = assemtris_LDFLAGS =
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@ -341,10 +340,13 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \
maintainer-clean maintainer-clean
INCLUDES += -I../../Simulator INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.2 1998/04/14 02:26:00 curt
# Code reorganizations. Added a Lib/ directory for more general libraries.
#
# Revision 1.1 1998/04/08 22:54:57 curt # Revision 1.1 1998/04/08 22:54:57 curt
# Adopted Gnu automake/autoconf system. # Adopted Gnu automake/autoconf system.
# #

9
AssemTris/assemtris.c
View file

@ -36,7 +36,7 @@
// #include <Math/fg_geodesy.h> // #include <Math/fg_geodesy.h>
// #include <Math/mat3.h> // #include <Math/mat3.h>
// #include <Math/polar.h> // #include <Math/polar.h>
#include <Scenery/Bucket/bucketutils.h> #include <Bucket/bucketutils.h>
int nodecount = 0; int nodecount = 0;
@ -454,9 +454,12 @@ int main(int argc, char **argv) {
/* $Log$ /* $Log$
/* Revision 1.6 1998/04/08 22:54:58 curt /* Revision 1.7 1998/04/14 02:26:00 curt
/* Adopted Gnu automake/autoconf system. /* Code reorganizations. Added a Lib/ directory for more general libraries.
/* /*
* Revision 1.6 1998/04/08 22:54:58 curt
* Adopted Gnu automake/autoconf system.
*
* Revision 1.5 1998/03/03 16:00:52 curt * Revision 1.5 1998/03/03 16:00:52 curt
* More c++ compile tweaks. * More c++ compile tweaks.
* *

14
FixNode/Makefile.am
View file

@ -32,14 +32,22 @@ fixnode_SOURCES = \
triload.cxx triload.hxx triload.cxx triload.hxx
fixnode_LDADD = \ fixnode_LDADD = \
$(top_builddir)/Tools/DEM/libDEM.la \ $(top_builddir)/Lib/DEM/libDEM.la \
$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la $(top_builddir)/Lib/Bucket/libBucket.la
INCLUDES += -I.. -I../../Simulator INCLUDES += -I$(top_builddir) -I$(top_builddir)/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
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.2 1998/04/14 02:26:02 curt
# Code reorganizations. Added a Lib/ directory for more general libraries.
#
# Revision 1.1 1998/04/08 23:05:54 curt # Revision 1.1 1998/04/08 23:05:54 curt
# Adopted Gnu automake/autoconf system. # Adopted Gnu automake/autoconf system.
# #

25
FixNode/Makefile.in
View file

@ -104,15 +104,20 @@ fixnode_SOURCES = \
triload.cxx triload.hxx triload.cxx triload.hxx
fixnode_LDADD = \ fixnode_LDADD = \
$(top_builddir)/Tools/DEM/libDEM.la \ $(top_builddir)/Lib/DEM/libDEM.la \
$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la $(top_builddir)/Lib/Bucket/libBucket.la
# 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
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -121,10 +126,9 @@ X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
fixnode_OBJECTS = fixnode.o main.o triload.o fixnode_OBJECTS = fixnode.o main.o triload.o
fixnode_DEPENDENCIES = $(top_builddir)/Tools/DEM/libDEM.la \ fixnode_DEPENDENCIES = $(top_builddir)/Lib/DEM/libDEM.la \
$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la $(top_builddir)/Lib/Bucket/libBucket.la
fixnode_LDFLAGS = fixnode_LDFLAGS =
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
@ -361,11 +365,14 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \
maintainer-clean maintainer-clean
INCLUDES += -I.. -I../../Simulator INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.1 1998/04/08 23:05:55 curt # Revision 1.2 1998/04/14 02:26:03 curt
# Code reorganizations. Added a Lib/ directory for more general libraries.
#
# Revision 1.1 1998/04/08 23:05:54 curt
# Adopted Gnu automake/autoconf system. # Adopted Gnu automake/autoconf system.
# #
# Revision 1.4 1998/04/06 21:09:44 curt # Revision 1.4 1998/04/06 21:09:44 curt

9
FixNode/fixnode.cxx
View file

@ -53,7 +53,7 @@ void fixnodes( char *filename, fgDEM dem,
nodes[i][1], nodes[i][2]); */ nodes[i][1], nodes[i][2]); */
nodes[i][2] = nodes[i][2] =
dem.interpolate_altitude(dem_data, nodes[i][0], nodes[i][1]); dem.interpolate_altitude(nodes[i][0], nodes[i][1]);
/* printf("Fixed: %d %.2f %.2f %.2f\n", i, nodes[i][0], /* printf("Fixed: %d %.2f %.2f %.2f\n", i, nodes[i][0],
nodes[i][1], nodes[i][2]); */ nodes[i][1], nodes[i][2]); */
@ -80,9 +80,12 @@ void fixnodes( char *filename, fgDEM dem,
/* $Log$ /* $Log$
/* Revision 1.1 1998/04/08 23:05:56 curt /* Revision 1.2 1998/04/14 02:26:03 curt
/* Adopted Gnu automake/autoconf system. /* Code reorganizations. Added a Lib/ directory for more general libraries.
/* /*
* Revision 1.1 1998/04/08 23:05:56 curt
* Adopted Gnu automake/autoconf system.
*
* Revision 1.5 1998/03/19 02:50:19 curt * Revision 1.5 1998/03/19 02:50:19 curt
* Updated to support -lDEM class. * Updated to support -lDEM class.
* *

5
FixNode/main.cxx
View file

@ -93,7 +93,7 @@ int main(int argc, char **argv) {
// load the corresponding dem file so we can interpolate elev values // load the corresponding dem file so we can interpolate elev values
dem.open(demfile); dem.open(demfile);
dem.parse(dem_data); dem.parse();
dem.close(); dem.close();
// process all the *.1.node files in the specified directory // process all the *.1.node files in the specified directory
@ -104,6 +104,9 @@ int main(int argc, char **argv) {
// $Log$ // $Log$
// Revision 1.2 1998/04/14 02:26:04 curt
// Code reorganizations. Added a Lib/ directory for more general libraries.
//
// Revision 1.1 1998/04/08 23:05:57 curt // Revision 1.1 1998/04/08 23:05:57 curt
// Adopted Gnu automake/autoconf system. // Adopted Gnu automake/autoconf system.
// //

2
FixObj/MAT3vec.c
View file

@ -19,7 +19,7 @@
* The two vectors involved may be the same. * The two vectors involved may be the same.
*/ */
#include <Math/mat3.h> #include "mat3.h"
#ifndef TRUE #ifndef TRUE
# define TRUE 1 # define TRUE 1

5
FixObj/Makefile.am
View file

@ -30,11 +30,14 @@ fixobj_SOURCES = main.c mat3.h obj.c obj.h MAT3vec.c
fixobj_LDADD = fixobj_LDADD =
INCLUDES += -I../../Simulator INCLUDES += -I$(top_builddir)
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.2 1998/04/14 02:26:05 curt
# Code reorganizations. Added a Lib/ directory for more general libraries.
#
# Revision 1.1 1998/04/08 23:19:35 curt # Revision 1.1 1998/04/08 23:19:35 curt
# Adopted Gnu automake/autoconf system. # Adopted Gnu automake/autoconf system.
# #

11
FixObj/Makefile.in
View file

@ -102,12 +102,12 @@ fixobj_SOURCES = main.c mat3.h obj.c obj.h MAT3vec.c
fixobj_LDADD = fixobj_LDADD =
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -339,11 +339,14 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \
maintainer-clean maintainer-clean
INCLUDES += -I../../Simulator INCLUDES += -I$(top_builddir)
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.1 1998/04/08 23:19:36 curt # Revision 1.2 1998/04/14 02:26:05 curt
# Code reorganizations. Added a Lib/ directory for more general libraries.
#
# Revision 1.1 1998/04/08 23:19:35 curt
# Adopted Gnu automake/autoconf system. # Adopted Gnu automake/autoconf system.
# #
# Revision 1.2 1998/01/21 02:55:53 curt # Revision 1.2 1998/01/21 02:55:53 curt

2
SplitTris/MAT3vec.c
View file

@ -19,7 +19,7 @@
* The two vectors involved may be the same. * The two vectors involved may be the same.
*/ */
#include <Math/mat3.h> #include "mat3.h"
#ifndef TRUE #ifndef TRUE
# define TRUE 1 # define TRUE 1

7
SplitTris/Makefile.am
View file

@ -34,13 +34,16 @@ splittris_SOURCES = \
splittris.c splittris.h splittris.c splittris.h
splittris_LDADD = \ splittris_LDADD = \
$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la $(top_builddir)/Lib/Bucket/libBucket.la
INCLUDES += -I../../Simulator INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.2 1998/04/14 02:26:06 curt
# Code reorganizations. Added a Lib/ directory for more general libraries.
#
# Revision 1.1 1998/04/08 23:21:10 curt # Revision 1.1 1998/04/08 23:21:10 curt
# Adopted Gnu automake/autoconf system. # Adopted Gnu automake/autoconf system.
# #

16
SplitTris/Makefile.in
View file

@ -106,14 +106,14 @@ splittris_SOURCES = \
splittris.c splittris.h splittris.c splittris.h
splittris_LDADD = \ splittris_LDADD = \
$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la $(top_builddir)/Lib/Bucket/libBucket.la
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -122,8 +122,7 @@ X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
splittris_OBJECTS = MAT3vec.o fg_geodesy.o polar.o splittris.o splittris_OBJECTS = MAT3vec.o fg_geodesy.o polar.o splittris.o
splittris_DEPENDENCIES = \ splittris_DEPENDENCIES = $(top_builddir)/Lib/Bucket/libBucket.la
$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la
splittris_LDFLAGS = splittris_LDFLAGS =
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@ -347,11 +346,14 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \
maintainer-clean maintainer-clean
INCLUDES += -I../../Simulator INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.1 1998/04/08 23:21:11 curt # Revision 1.2 1998/04/14 02:26:07 curt
# Code reorganizations. Added a Lib/ directory for more general libraries.
#
# Revision 1.1 1998/04/08 23:21:10 curt
# Adopted Gnu automake/autoconf system. # Adopted Gnu automake/autoconf system.
# #
# Revision 1.3 1998/01/21 02:55:55 curt # Revision 1.3 1998/01/21 02:55:55 curt

10
SplitTris/polar.c
View file

@ -27,9 +27,10 @@
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <Math/polar.h>
#include <Include/fg_constants.h> #include <Include/fg_constants.h>
#include "polar.h"
/* we can save these values between calls for efficiency */ /* we can save these values between calls for efficiency */
static double st, ct, sp, cp; static double st, ct, sp, cp;
@ -101,9 +102,12 @@ struct fgCartesianPoint fgRotateCartesianPoint(struct fgCartesianPoint p) {
/* $Log$ /* $Log$
/* Revision 1.1 1998/04/08 23:21:12 curt /* Revision 1.2 1998/04/14 02:26:07 curt
/* Adopted Gnu automake/autoconf system. /* Code reorganizations. Added a Lib/ directory for more general libraries.
/* /*
* Revision 1.1 1998/04/08 23:21:12 curt
* Adopted Gnu automake/autoconf system.
*
* Revision 1.5 1998/01/27 00:48:00 curt * Revision 1.5 1998/01/27 00:48:00 curt
* Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message * Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
* system and commandline/config file processing code. * system and commandline/config file processing code.

9
SplitTris/splittris.c
View file

@ -36,7 +36,7 @@
#include <Include/fg_constants.h> #include <Include/fg_constants.h>
#include <Include/fg_types.h> #include <Include/fg_types.h>
#include <Scenery/Bucket/bucketutils.h> #include <Bucket/bucketutils.h>
#include "fg_geodesy.h" #include "fg_geodesy.h"
#include "mat3.h" #include "mat3.h"
@ -612,9 +612,12 @@ int main(int argc, char **argv) {
/* $Log$ /* $Log$
/* Revision 1.7 1998/04/08 23:21:13 curt /* Revision 1.8 1998/04/14 02:26:08 curt
/* Adopted Gnu automake/autoconf system. /* Code reorganizations. Added a Lib/ directory for more general libraries.
/* /*
* Revision 1.7 1998/04/08 23:21:13 curt
* Adopted Gnu automake/autoconf system.
*
* Revision 1.6 1998/03/03 15:36:13 curt * Revision 1.6 1998/03/03 15:36:13 curt
* Tweaks for compiling with g++ * Tweaks for compiling with g++
* *

4
Stripe_u/Makefile.in
View file

@ -100,12 +100,12 @@ strips_SOURCES = \
triangulate.h triangulatex.h \ triangulate.h triangulatex.h \
util.c util.h util.c util.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@

1
Tools/Makefile.am
View file

@ -2,7 +2,6 @@ EXTRA_DIST = process-dem.pl
SUBDIRS = \ SUBDIRS = \
AssemTris \ AssemTris \
DEM \
Dem2node \ Dem2node \
FixNode \ FixNode \
FixObj \ FixObj \

3
Tools/Makefile.in
View file

@ -75,7 +75,6 @@ EXTRA_DIST = process-dem.pl
SUBDIRS = \ SUBDIRS = \
AssemTris \ AssemTris \
DEM \
Dem2node \ Dem2node \
FixNode \ FixNode \
FixObj \ FixObj \
@ -86,7 +85,7 @@ SUBDIRS = \
bin_SCRIPTS = process-dem.pl bin_SCRIPTS = process-dem.pl
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../Simulator/Include/config.h CONFIG_HEADER = ../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
SCRIPTS = $(bin_SCRIPTS) SCRIPTS = $(bin_SCRIPTS)

2
Tri2obj/MAT3vec.c
View file

@ -19,7 +19,7 @@
* The two vectors involved may be the same. * The two vectors involved may be the same.
*/ */
#include <Math/mat3.h> #include "mat3.h"
#ifndef TRUE #ifndef TRUE
# define TRUE 1 # define TRUE 1

7
Tri2obj/Makefile.am
View file

@ -34,13 +34,16 @@ tri2obj_SOURCES = \
polar.c polar.h polar.c polar.h
tri2obj_LDADD = \ tri2obj_LDADD = \
$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la $(top_builddir)/Lib/Bucket/libBucket.la
INCLUDES += -I../../Simulator INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.2 1998/04/14 02:26:09 curt
# Code reorganizations. Added a Lib/ directory for more general libraries.
#
# Revision 1.1 1998/04/08 23:22:13 curt # Revision 1.1 1998/04/08 23:22:13 curt
# Adopted Gnu automake/autoconf system. # Adopted Gnu automake/autoconf system.
# #

16
Tri2obj/Makefile.in
View file

@ -106,14 +106,14 @@ tri2obj_SOURCES = \
polar.c polar.h polar.c polar.h
tri2obj_LDADD = \ tri2obj_LDADD = \
$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la $(top_builddir)/Lib/Bucket/libBucket.la
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -122,8 +122,7 @@ X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
tri2obj_OBJECTS = tri2obj.o MAT3vec.o fg_geodesy.o polar.o tri2obj_OBJECTS = tri2obj.o MAT3vec.o fg_geodesy.o polar.o
tri2obj_DEPENDENCIES = \ tri2obj_DEPENDENCIES = $(top_builddir)/Lib/Bucket/libBucket.la
$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la
tri2obj_LDFLAGS = tri2obj_LDFLAGS =
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@ -347,11 +346,14 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \
maintainer-clean maintainer-clean
INCLUDES += -I../../Simulator INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.1 1998/04/08 23:22:14 curt # Revision 1.2 1998/04/14 02:26:10 curt
# Code reorganizations. Added a Lib/ directory for more general libraries.
#
# Revision 1.1 1998/04/08 23:22:13 curt
# Adopted Gnu automake/autoconf system. # Adopted Gnu automake/autoconf system.
# #
# Revision 1.2 1998/01/21 02:55:46 curt # Revision 1.2 1998/01/21 02:55:46 curt

10
Tri2obj/polar.c
View file

@ -27,9 +27,10 @@
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <Math/polar.h>
#include <Include/fg_constants.h> #include <Include/fg_constants.h>
#include "polar.h"
/* we can save these values between calls for efficiency */ /* we can save these values between calls for efficiency */
static double st, ct, sp, cp; static double st, ct, sp, cp;
@ -101,9 +102,12 @@ struct fgCartesianPoint fgRotateCartesianPoint(struct fgCartesianPoint p) {
/* $Log$ /* $Log$
/* Revision 1.1 1998/04/08 23:22:16 curt /* Revision 1.2 1998/04/14 02:26:10 curt
/* Adopted Gnu automake/autoconf system. /* Code reorganizations. Added a Lib/ directory for more general libraries.
/* /*
* Revision 1.1 1998/04/08 23:22:16 curt
* Adopted Gnu automake/autoconf system.
*
* Revision 1.5 1998/01/27 00:48:00 curt * Revision 1.5 1998/01/27 00:48:00 curt
* Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message * Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
* system and commandline/config file processing code. * system and commandline/config file processing code.

9
Tri2obj/tri2obj.c
View file

@ -34,7 +34,7 @@
#include <Include/fg_constants.h> #include <Include/fg_constants.h>
#include <Include/fg_types.h> #include <Include/fg_types.h>
#include <Scenery/Bucket/bucketutils.h> #include <Bucket/bucketutils.h>
#include "fg_geodesy.h" #include "fg_geodesy.h"
#include "mat3.h" #include "mat3.h"
@ -640,9 +640,12 @@ int main(int argc, char **argv) {
/* $Log$ /* $Log$
/* Revision 1.12 1998/04/08 23:22:18 curt /* Revision 1.13 1998/04/14 02:26:11 curt
/* Adopted Gnu automake/autoconf system. /* Code reorganizations. Added a Lib/ directory for more general libraries.
/* /*
* Revision 1.12 1998/04/08 23:22:18 curt
* Adopted Gnu automake/autoconf system.
*
* Revision 1.11 1998/03/03 16:01:00 curt * Revision 1.11 1998/03/03 16:01:00 curt
* More c++ compile tweaks. * More c++ compile tweaks.
* *

4
Triangle/Makefile.in
View file

@ -86,12 +86,12 @@ bin_PROGRAMS = triangle # showme
triangle_SOURCES = triangle.c triangle.h triangle_SOURCES = triangle.c triangle.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@