Minor cleanups and reorganizations.

diff --git a/Makefile.in b/Makefile.in
index e74ad67acb6fd41afd4e78eb0135e78e38571ed3..dc482be81948c82331d4c7cfbf0b2f763a62483d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -96,7 +96,7 @@ all: Makefile $(HEADERS) config.h
 
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-       cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Include/Makefile
+       cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Include/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
@@ -107,7 +107,7 @@ config.h: stamp-h
        @:
 stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
        cd $(top_builddir) \
-         && CONFIG_FILES= CONFIG_HEADERS=Src/Include/config.h \
+         && CONFIG_FILES= CONFIG_HEADERS=Simulator/Include/config.h \
             $(SHELL) ./config.status
        @echo timestamp > stamp-h
 $(srcdir)/config.h.in: @MAINT@$(srcdir)/stamp-h.in
@@ -166,14 +166,14 @@ maintainer-clean-tags:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = Src/Include
+subdir = Simulator/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 Src/Include/Makefile
+         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Include/Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \