Changeset 25

Timestamp:

11/28/07 15:48:19

Author:

hobu

Message:

more progress on automake for includes directories... close, but not quite

Files:

• spatialindex/trunk/configure (modified) (2 diffs)
• spatialindex/trunk/configure.ac (modified) (1 diff)
• spatialindex/trunk/include/Makefile.am (modified) (1 diff)
• spatialindex/trunk/include/tools/Makefile.am (modified) (1 diff)
• spatialindex/trunk/Makefile.am (modified) (1 diff)
• spatialindex/trunk/Makefile.in (modified) (11 diffs)

spatialindex/trunk/configure

@@ -20676 +20676 @@
-
-
-
+include/Makefile include/tools/Makefile 
-
-
@@ -21280 +21280 @@
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+    "include/tools/Makefile") CONFIG_FILES="$CONFIG_FILES include/tools/Makefile" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "src/spatialindex/Makefile") CONFIG_FILES="$CONFIG_FILES src/spatialindex/Makefile" ;;

spatialindex/trunk/configure.ac

@@ -32 +32 @@
-
-AC_CONFIG_FILES([       Makefile
+                                        include/Makefile
+                                        include/tools/Makefile
-                                        src/Makefile
-                                        src/spatialindex/Makefile

spatialindex/trunk/include/Makefile.am

@@ -1 +1 @@
-SUBDIRS = tools
-
-
-
-
+
-                        RTree.h \
-                        MVRTree.h \

spatialindex/trunk/include/tools/Makefile.am

@@ -1 @@
-spatialindexdir = $(includedir)/spatialindex/tools
-
-
+nobase_
-                        LineSegment.h \
-                        PointerPool.h \

spatialindex/trunk/Makefile.am

@@ -1 +1 @@
-## Makefile.am -- Process this file with automake to produce Makefile.in
-
+
+
-lib_LTLIBRARIES = libspatialindex.la
-pkgincludedir = $(includedir)/spatialindex
-nobase_pkginclude_HEADERS = include/SpatialIndex.h include/RTree.h include/MVRTree.h include/TPRTree.h include/TimePoint.h include/TimeRegion.h include/MovingPoint.h include/MovingRegion.h include/tools/Tools.h include/tools/LineSegment.h include/tools/PointerPool.h include/tools/Point.h include/tools/PoolPointer.h include/tools/Region.h include/tools/SmartPointer.h include/tools/TemporaryFile.h include/tools/Tools.h
-libspatialindex_la_SOURCES = 
-libspatialindex_la_LIBADD = src/spatialindex/liblibrary.la src/storagemanager/libstoragemanager.la src/rtree/librtree.la src/mvrtree/libmvrtree.la src/tprtree/libtprtree.la src/tools/geometry/libgeometry.la src/tools/tools/libtools.la

spatialindex/trunk/Makefile.in

@@ -14 +14 @@
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
@@ -34 +33 @@
-host_triplet = @host@
-subdir = .
-
-
+
-        $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-        ChangeLog INSTALL NEWS config.guess config.sub depcomp \
@@ -53 +51 @@
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- "$(DESTDIR)$(pkgincludedir)"
+
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -81 +79 @@
-        installcheck-recursive installdirs-recursive pdf-recursive \
-        ps-recursive uninstall-recursive
-nobase_pkgincludeHEADERS_INSTALL = $(install_sh_DATA)
-HEADERS = $(nobase_pkginclude_HEADERS)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-  distclean-recursive maintainer-clean-recursive
@@ -205 +201 @@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
+
+
-lib_LTLIBRARIES = libspatialindex.la
-nobase_pkginclude_HEADERS = include/SpatialIndex.h include/RTree.h include/MVRTree.h include/TPRTree.h include/TimePoint.h include/TimeRegion.h include/MovingPoint.h include/MovingRegion.h include/tools/Tools.h include/tools/LineSegment.h include/tools/PointerPool.h include/tools/Point.h include/tools/PoolPointer.h include/tools/Region.h include/tools/SmartPointer.h include/tools/TemporaryFile.h include/tools/Tools.h
-libspatialindex_la_SOURCES = 
-libspatialindex_la_LIBADD = src/spatialindex/liblibrary.la src/storagemanager/libstoragemanager.la src/rtree/librtree.la src/mvrtree/libmvrtree.la src/tprtree/libtprtree.la src/tools/geometry/libgeometry.la src/tools/tools/libtools.la
@@ -290 +286 @@
-distclean-libtool:
-        -rm -f libtool
-install-nobase_pkgincludeHEADERS: $(nobase_pkginclude_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
-        @$(am__vpath_adj_setup) \
-        list='$(nobase_pkginclude_HEADERS)'; for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          $(am__vpath_adj) \
-          echo " $(nobase_pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
-          $(nobase_pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
-        done
-
-uninstall-nobase_pkgincludeHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @$(am__vpath_adj_setup) \
-        list='$(nobase_pkginclude_HEADERS)'; for p in $$list; do \
-          $(am__vpath_adj) \
-          echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
-          rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
-        done
-
-# This directory's subdirectories are mostly independent; you can cd
@@ -585 +562 @@
-check-am: all-am
-check: check-recursive
- $(HEADERS)
+
-installdirs: installdirs-recursive
-installdirs-am:
- "$(DESTDIR)$(pkgincludedir)"
+
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
@@ -636 +613 @@
-info-am:
-
- install-nobase_pkgincludeHEADERS
+
-
-install-dvi: install-dvi-recursive
@@ -673 +650 @@
-ps-am:
-
-
-
+
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
@@ -689 +665 @@
-        install-dvi-am install-exec install-exec-am install-html \
-        install-html-am install-info install-info-am \
-
-
+
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs installdirs-am maintainer-clean \
@@ -696 +671 @@
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags tags-recursive uninstall uninstall-am \
- uninstall-nobase_pkgincludeHEADERS
+
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.