From cd7233754fa98f5b507aead5e100374df0a29ac8 Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 14 Apr 1998 02:25:54 +0000 Subject: [PATCH] Code reorganizations. Added a Lib/ directory for more general libraries. --- AssemTris/Makefile.am | 7 +++++-- AssemTris/Makefile.in | 14 ++++++++------ AssemTris/assemtris.c | 9 ++++++--- FixNode/Makefile.am | 14 +++++++++++--- FixNode/Makefile.in | 25 ++++++++++++++++--------- FixNode/fixnode.cxx | 9 ++++++--- FixNode/main.cxx | 5 ++++- FixObj/MAT3vec.c | 2 +- FixObj/Makefile.am | 5 ++++- FixObj/Makefile.in | 11 +++++++---- SplitTris/MAT3vec.c | 2 +- SplitTris/Makefile.am | 7 +++++-- SplitTris/Makefile.in | 16 +++++++++------- SplitTris/polar.c | 10 +++++++--- SplitTris/splittris.c | 9 ++++++--- Stripe_u/Makefile.in | 4 ++-- Tools/Makefile.am | 1 - Tools/Makefile.in | 3 +-- Tri2obj/MAT3vec.c | 2 +- Tri2obj/Makefile.am | 7 +++++-- Tri2obj/Makefile.in | 16 +++++++++------- Tri2obj/polar.c | 10 +++++++--- Tri2obj/tri2obj.c | 9 ++++++--- Triangle/Makefile.in | 4 ++-- 24 files changed, 129 insertions(+), 72 deletions(-) diff --git a/AssemTris/Makefile.am b/AssemTris/Makefile.am index aed518219..190b0ec5a 100644 --- a/AssemTris/Makefile.am +++ b/AssemTris/Makefile.am @@ -29,13 +29,16 @@ bin_PROGRAMS = assemtris assemtris_SOURCES = assemtris.c assemtris.h 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$ +# 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 # Adopted Gnu automake/autoconf system. # diff --git a/AssemTris/Makefile.in b/AssemTris/Makefile.in index 1bcc681b3..f40608c87 100644 --- a/AssemTris/Makefile.in +++ b/AssemTris/Makefile.in @@ -101,14 +101,14 @@ bin_PROGRAMS = assemtris assemtris_SOURCES = assemtris.c assemtris.h assemtris_LDADD = \ - $(top_builddir)/Simulator/Scenery/Bucket/libBucket.la + $(top_builddir)/Lib/Bucket/libBucket.la mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = PROGRAMS = $(bin_PROGRAMS) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -117,8 +117,7 @@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ assemtris_OBJECTS = assemtris.o -assemtris_DEPENDENCIES = \ -$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la +assemtris_DEPENDENCIES = $(top_builddir)/Lib/Bucket/libBucket.la assemtris_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @@ -341,10 +340,13 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \ maintainer-clean -INCLUDES += -I../../Simulator +INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $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 # Adopted Gnu automake/autoconf system. # diff --git a/AssemTris/assemtris.c b/AssemTris/assemtris.c index 835dc756e..572990386 100644 --- a/AssemTris/assemtris.c +++ b/AssemTris/assemtris.c @@ -36,7 +36,7 @@ // #include // #include // #include -#include +#include int nodecount = 0; @@ -454,9 +454,12 @@ int main(int argc, char **argv) { /* $Log$ -/* Revision 1.6 1998/04/08 22:54:58 curt -/* Adopted Gnu automake/autoconf system. +/* Revision 1.7 1998/04/14 02:26:00 curt +/* 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 * More c++ compile tweaks. * diff --git a/FixNode/Makefile.am b/FixNode/Makefile.am index 4445f8400..fa6b8ef2d 100644 --- a/FixNode/Makefile.am +++ b/FixNode/Makefile.am @@ -32,14 +32,22 @@ fixnode_SOURCES = \ triload.cxx triload.hxx fixnode_LDADD = \ - $(top_builddir)/Tools/DEM/libDEM.la \ - $(top_builddir)/Simulator/Scenery/Bucket/libBucket.la + $(top_builddir)/Lib/DEM/libDEM.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$ +# 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 # Adopted Gnu automake/autoconf system. # diff --git a/FixNode/Makefile.in b/FixNode/Makefile.in index 091d3835a..828ad939a 100644 --- a/FixNode/Makefile.in +++ b/FixNode/Makefile.in @@ -104,15 +104,20 @@ fixnode_SOURCES = \ triload.cxx triload.hxx fixnode_LDADD = \ - $(top_builddir)/Tools/DEM/libDEM.la \ - $(top_builddir)/Simulator/Scenery/Bucket/libBucket.la + $(top_builddir)/Lib/DEM/libDEM.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 -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = PROGRAMS = $(bin_PROGRAMS) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -121,10 +126,9 @@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ fixnode_OBJECTS = fixnode.o main.o triload.o -fixnode_DEPENDENCIES = $(top_builddir)/Tools/DEM/libDEM.la \ -$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la +fixnode_DEPENDENCIES = $(top_builddir)/Lib/DEM/libDEM.la \ +$(top_builddir)/Lib/Bucket/libBucket.la fixnode_LDFLAGS = -CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ @@ -361,11 +365,14 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \ maintainer-clean -INCLUDES += -I.. -I../../Simulator +INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $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. # # Revision 1.4 1998/04/06 21:09:44 curt diff --git a/FixNode/fixnode.cxx b/FixNode/fixnode.cxx index 8acf685a7..b4408fbe6 100644 --- a/FixNode/fixnode.cxx +++ b/FixNode/fixnode.cxx @@ -53,7 +53,7 @@ void fixnodes( char *filename, fgDEM dem, nodes[i][1], 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], nodes[i][1], nodes[i][2]); */ @@ -80,9 +80,12 @@ void fixnodes( char *filename, fgDEM dem, /* $Log$ -/* Revision 1.1 1998/04/08 23:05:56 curt -/* Adopted Gnu automake/autoconf system. +/* 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:56 curt + * Adopted Gnu automake/autoconf system. + * * Revision 1.5 1998/03/19 02:50:19 curt * Updated to support -lDEM class. * diff --git a/FixNode/main.cxx b/FixNode/main.cxx index 840ee23ae..8130ab8d4 100644 --- a/FixNode/main.cxx +++ b/FixNode/main.cxx @@ -93,7 +93,7 @@ int main(int argc, char **argv) { // load the corresponding dem file so we can interpolate elev values dem.open(demfile); - dem.parse(dem_data); + dem.parse(); dem.close(); // process all the *.1.node files in the specified directory @@ -104,6 +104,9 @@ int main(int argc, char **argv) { // $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 // Adopted Gnu automake/autoconf system. // diff --git a/FixObj/MAT3vec.c b/FixObj/MAT3vec.c index 24f2939af..a971ebe10 100644 --- a/FixObj/MAT3vec.c +++ b/FixObj/MAT3vec.c @@ -19,7 +19,7 @@ * The two vectors involved may be the same. */ -#include +#include "mat3.h" #ifndef TRUE # define TRUE 1 diff --git a/FixObj/Makefile.am b/FixObj/Makefile.am index 3e33b5d82..4be395bd8 100644 --- a/FixObj/Makefile.am +++ b/FixObj/Makefile.am @@ -30,11 +30,14 @@ fixobj_SOURCES = main.c mat3.h obj.c obj.h MAT3vec.c fixobj_LDADD = -INCLUDES += -I../../Simulator +INCLUDES += -I$(top_builddir) #--------------------------------------------------------------------------- # $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 # Adopted Gnu automake/autoconf system. # diff --git a/FixObj/Makefile.in b/FixObj/Makefile.in index 6c2a3683e..21f91603d 100644 --- a/FixObj/Makefile.in +++ b/FixObj/Makefile.in @@ -102,12 +102,12 @@ fixobj_SOURCES = main.c mat3.h obj.c obj.h MAT3vec.c fixobj_LDADD = mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = PROGRAMS = $(bin_PROGRAMS) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -339,11 +339,14 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \ maintainer-clean -INCLUDES += -I../../Simulator +INCLUDES += -I$(top_builddir) #--------------------------------------------------------------------------- # $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. # # Revision 1.2 1998/01/21 02:55:53 curt diff --git a/SplitTris/MAT3vec.c b/SplitTris/MAT3vec.c index 24f2939af..a971ebe10 100644 --- a/SplitTris/MAT3vec.c +++ b/SplitTris/MAT3vec.c @@ -19,7 +19,7 @@ * The two vectors involved may be the same. */ -#include +#include "mat3.h" #ifndef TRUE # define TRUE 1 diff --git a/SplitTris/Makefile.am b/SplitTris/Makefile.am index ca10cc328..aeac1186e 100644 --- a/SplitTris/Makefile.am +++ b/SplitTris/Makefile.am @@ -34,13 +34,16 @@ splittris_SOURCES = \ splittris.c splittris.h 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$ +# 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 # Adopted Gnu automake/autoconf system. # diff --git a/SplitTris/Makefile.in b/SplitTris/Makefile.in index 7eab72fae..b72e5c752 100644 --- a/SplitTris/Makefile.in +++ b/SplitTris/Makefile.in @@ -106,14 +106,14 @@ splittris_SOURCES = \ splittris.c splittris.h splittris_LDADD = \ - $(top_builddir)/Simulator/Scenery/Bucket/libBucket.la + $(top_builddir)/Lib/Bucket/libBucket.la mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = PROGRAMS = $(bin_PROGRAMS) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -122,8 +122,7 @@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ splittris_OBJECTS = MAT3vec.o fg_geodesy.o polar.o splittris.o -splittris_DEPENDENCIES = \ -$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la +splittris_DEPENDENCIES = $(top_builddir)/Lib/Bucket/libBucket.la splittris_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @@ -347,11 +346,14 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \ maintainer-clean -INCLUDES += -I../../Simulator +INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $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. # # Revision 1.3 1998/01/21 02:55:55 curt diff --git a/SplitTris/polar.c b/SplitTris/polar.c index c304f183b..e67881971 100644 --- a/SplitTris/polar.c +++ b/SplitTris/polar.c @@ -27,9 +27,10 @@ #include #include -#include #include +#include "polar.h" + /* we can save these values between calls for efficiency */ static double st, ct, sp, cp; @@ -101,9 +102,12 @@ struct fgCartesianPoint fgRotateCartesianPoint(struct fgCartesianPoint p) { /* $Log$ -/* Revision 1.1 1998/04/08 23:21:12 curt -/* Adopted Gnu automake/autoconf system. +/* 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:12 curt + * Adopted Gnu automake/autoconf system. + * * Revision 1.5 1998/01/27 00:48:00 curt * Incorporated Paul Bleisch's new debug message * system and commandline/config file processing code. diff --git a/SplitTris/splittris.c b/SplitTris/splittris.c index 38b87b227..e346285e4 100644 --- a/SplitTris/splittris.c +++ b/SplitTris/splittris.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include "fg_geodesy.h" #include "mat3.h" @@ -612,9 +612,12 @@ int main(int argc, char **argv) { /* $Log$ -/* Revision 1.7 1998/04/08 23:21:13 curt -/* Adopted Gnu automake/autoconf system. +/* Revision 1.8 1998/04/14 02:26:08 curt +/* 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 * Tweaks for compiling with g++ * diff --git a/Stripe_u/Makefile.in b/Stripe_u/Makefile.in index f012c211e..db9d8599e 100644 --- a/Stripe_u/Makefile.in +++ b/Stripe_u/Makefile.in @@ -100,12 +100,12 @@ strips_SOURCES = \ triangulate.h triangulatex.h \ util.c util.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = PROGRAMS = $(bin_PROGRAMS) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/Tools/Makefile.am b/Tools/Makefile.am index e8ab79034..f2a48ea4b 100644 --- a/Tools/Makefile.am +++ b/Tools/Makefile.am @@ -2,7 +2,6 @@ EXTRA_DIST = process-dem.pl SUBDIRS = \ AssemTris \ - DEM \ Dem2node \ FixNode \ FixObj \ diff --git a/Tools/Makefile.in b/Tools/Makefile.in index 03dc3845e..65188d202 100644 --- a/Tools/Makefile.in +++ b/Tools/Makefile.in @@ -75,7 +75,6 @@ EXTRA_DIST = process-dem.pl SUBDIRS = \ AssemTris \ - DEM \ Dem2node \ FixNode \ FixObj \ @@ -86,7 +85,7 @@ SUBDIRS = \ bin_SCRIPTS = process-dem.pl mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../Simulator/Include/config.h +CONFIG_HEADER = ../Include/config.h CONFIG_CLEAN_FILES = SCRIPTS = $(bin_SCRIPTS) diff --git a/Tri2obj/MAT3vec.c b/Tri2obj/MAT3vec.c index 24f2939af..a971ebe10 100644 --- a/Tri2obj/MAT3vec.c +++ b/Tri2obj/MAT3vec.c @@ -19,7 +19,7 @@ * The two vectors involved may be the same. */ -#include +#include "mat3.h" #ifndef TRUE # define TRUE 1 diff --git a/Tri2obj/Makefile.am b/Tri2obj/Makefile.am index 4b3cba1f1..13bece460 100644 --- a/Tri2obj/Makefile.am +++ b/Tri2obj/Makefile.am @@ -34,13 +34,16 @@ tri2obj_SOURCES = \ polar.c polar.h 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$ +# 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 # Adopted Gnu automake/autoconf system. # diff --git a/Tri2obj/Makefile.in b/Tri2obj/Makefile.in index 7bac2edd1..e344583f9 100644 --- a/Tri2obj/Makefile.in +++ b/Tri2obj/Makefile.in @@ -106,14 +106,14 @@ tri2obj_SOURCES = \ polar.c polar.h tri2obj_LDADD = \ - $(top_builddir)/Simulator/Scenery/Bucket/libBucket.la + $(top_builddir)/Lib/Bucket/libBucket.la mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = PROGRAMS = $(bin_PROGRAMS) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -122,8 +122,7 @@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ tri2obj_OBJECTS = tri2obj.o MAT3vec.o fg_geodesy.o polar.o -tri2obj_DEPENDENCIES = \ -$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la +tri2obj_DEPENDENCIES = $(top_builddir)/Lib/Bucket/libBucket.la tri2obj_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @@ -347,11 +346,14 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \ maintainer-clean -INCLUDES += -I../../Simulator +INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $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. # # Revision 1.2 1998/01/21 02:55:46 curt diff --git a/Tri2obj/polar.c b/Tri2obj/polar.c index fae264766..665efec33 100644 --- a/Tri2obj/polar.c +++ b/Tri2obj/polar.c @@ -27,9 +27,10 @@ #include #include -#include #include +#include "polar.h" + /* we can save these values between calls for efficiency */ static double st, ct, sp, cp; @@ -101,9 +102,12 @@ struct fgCartesianPoint fgRotateCartesianPoint(struct fgCartesianPoint p) { /* $Log$ -/* Revision 1.1 1998/04/08 23:22:16 curt -/* Adopted Gnu automake/autoconf system. +/* 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:16 curt + * Adopted Gnu automake/autoconf system. + * * Revision 1.5 1998/01/27 00:48:00 curt * Incorporated Paul Bleisch's new debug message * system and commandline/config file processing code. diff --git a/Tri2obj/tri2obj.c b/Tri2obj/tri2obj.c index fb0f8ddb2..482906b37 100644 --- a/Tri2obj/tri2obj.c +++ b/Tri2obj/tri2obj.c @@ -34,7 +34,7 @@ #include #include -#include +#include #include "fg_geodesy.h" #include "mat3.h" @@ -640,9 +640,12 @@ int main(int argc, char **argv) { /* $Log$ -/* Revision 1.12 1998/04/08 23:22:18 curt -/* Adopted Gnu automake/autoconf system. +/* Revision 1.13 1998/04/14 02:26:11 curt +/* 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 * More c++ compile tweaks. * diff --git a/Triangle/Makefile.in b/Triangle/Makefile.in index eed70e754..e5a0a2ccf 100644 --- a/Triangle/Makefile.in +++ b/Triangle/Makefile.in @@ -86,12 +86,12 @@ bin_PROGRAMS = triangle # showme triangle_SOURCES = triangle.c triangle.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../Simulator/Include/config.h +CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = PROGRAMS = $(bin_PROGRAMS) -DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include +DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -- 2.39.2