Removed DemInfo for now.

[flightgear.git] / FixObj / Makefile.in

diff --git a/FixObj/Makefile.in b/FixObj/Makefile.in
index 6c2a3683ec0aee611159a4d1e90692819bdab5be..f5f38a8300aa4a9b3552f45f05f7cb42f0a90cab 100644 (file)
--- a/FixObj/Makefile.in
+++ b/FixObj/Makefile.in
@@ -98,16 +98,19 @@ VERSION = @VERSION@
 
 bin_PROGRAMS = fixobj
 
-fixobj_SOURCES = main.c mat3.h obj.c obj.h MAT3vec.c
+fixobj_SOURCES = main.c obj.c obj.h
 
-fixobj_LDADD =
+fixobj_LDADD = \
+       $(top_builddir)/Lib/Math/libMath.la \
+       $(top_builddir)/Lib/Debug/libDebug.la \
+       $(top_builddir)/Lib/zlib/libz.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@
@@ -115,8 +118,9 @@ X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-fixobj_OBJECTS =  main.o obj.o MAT3vec.o
-fixobj_DEPENDENCIES = 
+fixobj_OBJECTS =  main.o obj.o
+fixobj_DEPENDENCIES =  $(top_builddir)/Lib/Math/libMath.la \
+$(top_builddir)/Lib/Debug/libDebug.la $(top_builddir)/Lib/zlib/libz.la
 fixobj_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -129,7 +133,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP = --best
-DEP_FILES =  .deps/MAT3vec.P .deps/main.P .deps/obj.P
+DEP_FILES =  .deps/main.P .deps/obj.P
 SOURCES = $(fixobj_SOURCES)
 OBJECTS = $(fixobj_OBJECTS)
 
@@ -339,11 +343,23 @@ 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:19:36  curt
+# Revision 1.7  1998/04/26 13:37:13  curt
+# Removed DemInfo for now.
+#
+# Revision 1.4  1998/04/24 00:44:05  curt
+# Added zlib support.
+#
+# Revision 1.3  1998/04/18 04:01:02  curt
+# Now use libMath rather than having local copies of math routines.
+#
+# 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