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

diff --git a/Makefile.in b/Makefile.in
index 32e1948e0867e3c03bd3f2053dc9cd2485e76eae..1036cbd97a69666b5e091ebfb7a29725585bbcb6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,7 +38,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 
-top_builddir = ../..
+top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
 AUTOCONF = @AUTOCONF@
@@ -94,7 +94,7 @@ all: Makefile config.h
 
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-       cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Include/Makefile
+       cd $(top_srcdir) && $(AUTOMAKE) --gnu Include/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
@@ -105,7 +105,7 @@ config.h: stamp-h
        @:
 stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
        cd $(top_builddir) \
-         && CONFIG_FILES= CONFIG_HEADERS=Simulator/Include/config.h \
+         && CONFIG_FILES= CONFIG_HEADERS=Include/config.h \
             $(SHELL) ./config.status
        @echo timestamp > stamp-h
 $(srcdir)/config.h.in: @MAINT@$(srcdir)/stamp-h.in
@@ -127,14 +127,14 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = Simulator/Include
+subdir = Include
 
 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 Simulator/Include/Makefile
+         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Include/Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \

diff --git a/config.h.in b/config.h.in
index 813f7bc639ab215b3902dc7a2d244c57d5a13266..448205b7952f044a4d1dd542b12d7ae83eb5b3c1 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,4 +1,4 @@
-/* Simulator/Include/config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* Include/config.h.in.  Generated automatically from configure.in by autoheader.  */
 
 /* Define to empty if the keyword does not work.  */
 #undef const
@@ -132,12 +132,18 @@
 /* Define if you have the GLcore library (-lGLcore).  */
 #undef HAVE_LIBGLCORE
 
+/* Define if you have the ICE library (-lICE).  */
+#undef HAVE_LIBICE
+
 /* Define if you have the MesaGL library (-lMesaGL).  */
 #undef HAVE_LIBMESAGL
 
 /* Define if you have the MesaGLU library (-lMesaGLU).  */
 #undef HAVE_LIBMESAGLU
 
+/* Define if you have the SM library (-lSM).  */
+#undef HAVE_LIBSM
+
 /* Define if you have the X11 library (-lX11).  */
 #undef HAVE_LIBX11
 
@@ -150,6 +156,9 @@
 /* Define if you have the Xmu library (-lXmu).  */
 #undef HAVE_LIBXMU
 
+/* Define if you have the Xt library (-lXt).  */
+#undef HAVE_LIBXT
+
 /* Define if you have the glut library (-lglut).  */
 #undef HAVE_LIBGLUT