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

[flightgear.git] / Scenery / Makefile.in

diff --git a/Scenery/Makefile.in b/Scenery/Makefile.in
index cae0ff2580d1539a4db1bdac99a08e31bb18a033..c4f45f80b0ab6f76675163904bb9a730670f3a76 100644 (file)
--- a/Scenery/Makefile.in
+++ b/Scenery/Makefile.in
@@ -73,20 +73,20 @@ VERSION = @VERSION@
 libdir = ${exec_prefix}/lib
 
 lib_LTLIBRARIES = libScenery.la
+
 libScenery_la_SOURCES = \
-       bucketutils.c \
-       obj.c \
-       scenery.c \
-       texload.c \
-       tilecache.c \
-       tilemgr.c
+       obj.c obj.h \
+       scenery.c scenery.h \
+       texload.c texload.h \
+       tilecache.c tilecache.h \
+       tilemgr.c tilemgr.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../Src/Include/config.h
+CONFIG_HEADER = ../../Include/config.h
 CONFIG_CLEAN_FILES = 
 LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I../../Src/Include
+DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -96,8 +96,8 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 libScenery_la_LDFLAGS = 
 libScenery_la_LIBADD = 
-libScenery_la_OBJECTS =  bucketutils.lo obj.lo scenery.lo texload.lo \
-tilecache.lo tilemgr.lo
+libScenery_la_OBJECTS =  obj.lo scenery.lo texload.lo tilecache.lo \
+tilemgr.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -109,8 +109,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP = --best
-DEP_FILES =  .deps/bucketutils.P .deps/obj.P .deps/scenery.P \
-.deps/texload.P .deps/tilecache.P .deps/tilemgr.P
+DEP_FILES =  .deps/obj.P .deps/scenery.P .deps/texload.P \
+.deps/tilecache.P .deps/tilemgr.P
 SOURCES = $(libScenery_la_SOURCES)
 OBJECTS = $(libScenery_la_OBJECTS)
 
@@ -119,7 +119,7 @@ all: Makefile $(LTLIBRARIES)
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-       cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Scenery/Makefile
+       cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Scenery/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
@@ -213,14 +213,14 @@ maintainer-clean-tags:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = Src/Scenery
+subdir = Simulator/Scenery
 
 distdir: $(DISTFILES)
        here=`cd $(top_builddir) && pwd`; \
        top_distdir=`cd $(top_distdir) && pwd`; \
        distdir=`cd $(distdir) && pwd`; \
        cd $(top_srcdir) \
-         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Scenery/Makefile
+         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Scenery/Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \
@@ -319,7 +319,10 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-INCLUDES += -I..
+INCLUDES += \
+       -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.