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

diff --git a/Astro/Makefile.am b/Astro/Makefile.am
index 0863e4d903b40f6e160305aafba8136e3684227c..e9d12c06531545d718476cdb9175350a8067b389 100644 (file)
--- a/Astro/Makefile.am
+++ b/Astro/Makefile.am
@@ -9,4 +9,4 @@ libAstro_la_SOURCES = \
        stars.c stars.h \
        sun.c sun.h
 
-INCLUDES += -I..
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator

diff --git a/Astro/Makefile.in b/Astro/Makefile.in
index d645c8e21d1e4453eaf2900faf3156cf70369563..9b9348cb296803a7d79aa8c151159c041f7ce2e9 100644 (file)
--- a/Astro/Makefile.in
+++ b/Astro/Makefile.in
@@ -81,12 +81,12 @@ libAstro_la_SOURCES = \
        stars.c stars.h \
        sun.c sun.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../Simulator/Include/config.h
+CONFIG_HEADER = ../../Include/config.h
 CONFIG_CLEAN_FILES = 
 LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include
+DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -319,7 +319,7 @@ 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.