removed from version control.

[flightgear.git] / Main / Makefile.in

diff --git a/Main/Makefile.in b/Main/Makefile.in
index 289ac5db7929668fc5700e1ec3624411b251b595..64171d5f97e56ea1d1476d450812574016ba79e4 100644 (file)
--- a/Main/Makefile.in
+++ b/Main/Makefile.in
@@ -78,35 +78,38 @@ bin_PROGRAMS = fg
 bin_SCRIPTS = runfg runfg.bat
 
 fg_SOURCES = \
-       GLUTkey.c GLUTkey.h \
-       GLUTmain.c \
+       GLUTkey.cxx GLUTkey.hxx \
+       GLUTmain.cxx \
+       airports.cxx airports.hxx \
        fg_config.h \
-       fg_debug.c fg_debug.h \
-       fg_getopt.c fg_getopt.h \
-       fg_init.c fg_init.h \
-       views.c views.h
+       fg_init.cxx fg_init.hxx \
+       options.cxx options.hxx \
+       views.cxx views.hxx
 
 fg_LDADD = \
        $(top_builddir)/Simulator/Aircraft/libAircraft.la \
        $(top_builddir)/Simulator/Astro/libAstro.la \
+       $(top_builddir)/Simulator/Autopilot/libAutopilot.la \
        $(top_builddir)/Simulator/Cockpit/libCockpit.la \
        $(top_builddir)/Simulator/Controls/libControls.la \
        $(top_builddir)/Simulator/Flight/libFlight.la \
        $(top_builddir)/Simulator/Flight/LaRCsim/libLaRCsim.la \
        $(top_builddir)/Simulator/Flight/Slew/libSlew.la \
        $(top_builddir)/Simulator/Scenery/libScenery.la \
-       $(top_builddir)/Simulator/Scenery/Bucket/libBucket.la \
        $(top_builddir)/Simulator/Time/libTime.la \
        $(top_builddir)/Simulator/Weather/libWeather.la \
         $(top_builddir)/Simulator/Joystick/libJoystick.la \
-       $(top_builddir)/Simulator/Math/libMath.la
+       $(top_builddir)/Lib/Math/libMath.la \
+       $(top_builddir)/Lib/Bucket/libBucket.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 =  runfg runfg.bat
 PROGRAMS =  $(bin_PROGRAMS)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include
+DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -114,44 +117,47 @@ X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-fg_OBJECTS =  GLUTkey.o GLUTmain.o fg_debug.o fg_getopt.o fg_init.o \
+fg_OBJECTS =  GLUTkey.o GLUTmain.o airports.o fg_init.o options.o \
 views.o
 fg_DEPENDENCIES =  $(top_builddir)/Simulator/Aircraft/libAircraft.la \
 $(top_builddir)/Simulator/Astro/libAstro.la \
+$(top_builddir)/Simulator/Autopilot/libAutopilot.la \
 $(top_builddir)/Simulator/Cockpit/libCockpit.la \
 $(top_builddir)/Simulator/Controls/libControls.la \
 $(top_builddir)/Simulator/Flight/libFlight.la \
 $(top_builddir)/Simulator/Flight/LaRCsim/libLaRCsim.la \
 $(top_builddir)/Simulator/Flight/Slew/libSlew.la \
 $(top_builddir)/Simulator/Scenery/libScenery.la \
-$(top_builddir)/Simulator/Scenery/Bucket/libBucket.la \
 $(top_builddir)/Simulator/Time/libTime.la \
 $(top_builddir)/Simulator/Weather/libWeather.la \
 $(top_builddir)/Simulator/Joystick/libJoystick.la \
-$(top_builddir)/Simulator/Math/libMath.la
+$(top_builddir)/Lib/Math/libMath.la \
+$(top_builddir)/Lib/Bucket/libBucket.la \
+$(top_builddir)/Lib/Debug/libDebug.la $(top_builddir)/Lib/zlib/libz.la
 fg_LDFLAGS = 
 SCRIPTS =  $(bin_SCRIPTS)
 
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  README Makefile.am Makefile.in runfg.bat.in runfg.in
+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 $@
+DIST_COMMON =  Makefile.am Makefile.in runfg.bat.in runfg.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP = --best
-DEP_FILES =  .deps/GLUTkey.P .deps/GLUTmain.P .deps/fg_debug.P \
-.deps/fg_getopt.P .deps/fg_init.P .deps/views.P
+DEP_FILES =  .deps/GLUTkey.P .deps/GLUTmain.P .deps/airports.P \
+.deps/fg_init.P .deps/options.P .deps/views.P
+CXXMKDEP = $(CXX) -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
 SOURCES = $(fg_SOURCES)
 OBJECTS = $(fg_OBJECTS)
 
 all: Makefile $(PROGRAMS) $(SCRIPTS)
 
 .SUFFIXES:
-.SUFFIXES: .S .c .lo .o .s
+.SUFFIXES: .S .c .cxx .lo .o .s
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Main/Makefile
 
@@ -223,7 +229,7 @@ maintainer-clean-libtool:
 
 fg: $(fg_OBJECTS) $(fg_DEPENDENCIES)
        @rm -f fg
-       $(LINK) $(fg_LDFLAGS) $(fg_OBJECTS) $(fg_LDADD) $(LIBS)
+       $(CXXLINK) $(fg_LDFLAGS) $(fg_OBJECTS) $(fg_LDADD) $(LIBS)
 
 install-binSCRIPTS: $(bin_SCRIPTS)
        @$(NORMAL_INSTALL)
@@ -243,6 +249,10 @@ uninstall-binSCRIPTS:
        list='$(bin_SCRIPTS)'; for p in $$list; do \
          rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
        done
+.cxx.o:
+       $(CXXCOMPILE) -c $<
+.cxx.lo:
+       $(LTCXXCOMPILE) -c $<
 
 tags: TAGS
 
@@ -309,6 +319,17 @@ maintainer-clean-depend:
        @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
          < .deps/$(*F).p > .deps/$(*F).P
        @-rm -f .deps/$(*F).p
+
+%.o: %.cxx
+       @echo '$(CXXCOMPILE) -c $<'; \
+       $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).P -c $<
+
+%.lo: %.cxx
+       @echo '$(LTCXXCOMPILE) -c $<'; \
+       $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<
+       @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
+         < .deps/$(*F).p > .deps/$(*F).P
+       @-rm -f .deps/$(*F).p
 info:
 dvi:
 check: all
@@ -377,7 +398,11 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
-INCLUDES += -I.. -DGLUT
+INCLUDES += \
+       -DGLUT \
+       -I$(top_builddir) \
+       -I$(top_builddir)/Lib \
+       -I$(top_builddir)/Simulator
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.