diff options
-rw-r--r-- | Makefile.in | 20 | ||||
-rw-r--r-- | config/open-axiom.m4 | 31 | ||||
-rwxr-xr-x | configure | 64 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/include/open-axiom/Charset (renamed from src/include/Charset.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/Constructor (renamed from src/include/Constructor.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/Database (renamed from src/include/Database.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/FileMapping (renamed from src/include/FileMapping.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/Input (renamed from src/include/Input.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/InputFragment (renamed from src/include/InputFragment.h) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/Lisp (renamed from src/include/Lisp.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/SourceFile (renamed from src/include/SourceFile.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/defaults (renamed from src/include/defaults.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/diagnostics (renamed from src/include/diagnostics.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/dialect (renamed from src/include/dialect.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/hash-table (renamed from src/utils/hash-table.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/iterator (renamed from src/include/iterator.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/sexpr (renamed from src/include/sexpr.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/storage (renamed from src/include/storage.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/string-pool (renamed from src/utils/string-pool.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/structure (renamed from src/include/structure.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/token (renamed from src/include/token.H) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/token-value (renamed from src/include/token-value.def) | 0 | ||||
-rw-r--r-- | src/include/open-axiom/vm (renamed from src/include/vm.H) | 0 | ||||
-rw-r--r-- | src/utils/Makefile.in | 3 |
25 files changed, 3 insertions, 116 deletions
diff --git a/Makefile.in b/Makefile.in index 2f46a05c..f600c853 100644 --- a/Makefile.in +++ b/Makefile.in @@ -233,31 +233,13 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/compile \ $(top_srcdir)/src/graph/viewman/Makefile.in \ $(top_srcdir)/src/gui/gui.pro.in \ $(top_srcdir)/src/hyper/Makefile.in \ - $(top_srcdir)/src/include/Charset.H \ - $(top_srcdir)/src/include/Constructor.H \ - $(top_srcdir)/src/include/Database.H \ - $(top_srcdir)/src/include/FileMapping.H \ - $(top_srcdir)/src/include/Input.H \ - $(top_srcdir)/src/include/InputFragment.h \ - $(top_srcdir)/src/include/Lisp.H \ - $(top_srcdir)/src/include/SourceFile.H \ - $(top_srcdir)/src/include/defaults.H \ - $(top_srcdir)/src/include/diagnostics.H \ - $(top_srcdir)/src/include/dialect.H \ - $(top_srcdir)/src/include/iterator.H \ - $(top_srcdir)/src/include/sexpr.H \ - $(top_srcdir)/src/include/storage.H \ - $(top_srcdir)/src/include/structure.H \ - $(top_srcdir)/src/include/token-value.def \ - $(top_srcdir)/src/include/token.H \ - $(top_srcdir)/src/include/vm.H \ $(top_srcdir)/src/input/Makefile.in \ $(top_srcdir)/src/interp/Makefile.in \ $(top_srcdir)/src/lib/Makefile.in \ $(top_srcdir)/src/lisp/Makefile.in \ $(top_srcdir)/src/share/Makefile.in \ $(top_srcdir)/src/sman/Makefile.in AUTHORS COPYING ChangeLog \ - INSTALL NEWS README TODO config/compile config/config.guess \ + INSTALL NEWS TODO config/compile config/config.guess \ config/config.sub config/depcomp config/install-sh \ config/ltmain.sh config/missing config/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/config/open-axiom.m4 b/config/open-axiom.m4 index 746c954e..991424c6 100644 --- a/config/open-axiom.m4 +++ b/config/open-axiom.m4 @@ -1197,34 +1197,3 @@ case $oa_cxx_compiler_lineage in ;; esac ]) - - -dnl -------------------------- -dnl -- OPENAXIOM_LINK_FILES -- -dnl -------------------------- -AC_DEFUN([OPENAXIOM_LINK_FILES],[ -oa_incdir=$target/include/open-axiom -AC_CONFIG_LINKS([ - $oa_incdir/hash-table:src/utils/hash-table.H - $oa_incdir/string-pool:src/utils/string-pool.H - $oa_incdir/diagnostics:src/include/diagnostics.H - $oa_incdir/dialect:src/include/dialect.H - $oa_incdir/token-value:src/include/token-value.def - $oa_incdir/token:src/include/token.H - $oa_incdir/defaults:src/include/defaults.H - $oa_incdir/structure:src/include/structure.H - $oa_incdir/iterator:src/include/iterator.H - $oa_incdir/storage:src/include/storage.H - $oa_incdir/Charset:src/include/Charset.H - $oa_incdir/FileMapping:src/include/FileMapping.H - $oa_incdir/SourceFile:src/include/SourceFile.H - $oa_incdir/Input:src/include/Input.H - $oa_incdir/vm:src/include/vm.H - $oa_incdir/sexpr:src/include/sexpr.H - $oa_incdir/Lisp:src/include/Lisp.H - $oa_incdir/InputFragment:src/include/InputFragment.h - $oa_incdir/Constructor:src/include/Constructor.H - $oa_incdir/Database:src/include/Database.H -]) - -]) @@ -19435,12 +19435,6 @@ case $oa_cxx_compiler_lineage in esac -oa_incdir=$target/include/open-axiom -ac_config_links="$ac_config_links $oa_incdir/hash-table:src/utils/hash-table.H $oa_incdir/string-pool:src/utils/string-pool.H $oa_incdir/diagnostics:src/include/diagnostics.H $oa_incdir/dialect:src/include/dialect.H $oa_incdir/token-value:src/include/token-value.def $oa_incdir/token:src/include/token.H $oa_incdir/defaults:src/include/defaults.H $oa_incdir/structure:src/include/structure.H $oa_incdir/iterator:src/include/iterator.H $oa_incdir/storage:src/include/storage.H $oa_incdir/Charset:src/include/Charset.H $oa_incdir/FileMapping:src/include/FileMapping.H $oa_incdir/SourceFile:src/include/SourceFile.H $oa_incdir/Input:src/include/Input.H $oa_incdir/vm:src/include/vm.H $oa_incdir/sexpr:src/include/sexpr.H $oa_incdir/Lisp:src/include/Lisp.H $oa_incdir/InputFragment:src/include/InputFragment.h $oa_incdir/Constructor:src/include/Constructor.H $oa_incdir/Database:src/include/Database.H" - - - - ## We are ready to instantiate makefiles. ac_config_files="$ac_config_files Makefile src/Makefile src/utils/Makefile src/rt/Makefile src/boot/Makefile src/algebra/Makefile" @@ -20086,7 +20080,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" -config_links="$ac_config_links" config_commands="$ac_config_commands" _ACEOF @@ -20117,9 +20110,6 @@ $config_files Configuration headers: $config_headers -Configuration links: -$config_links - Configuration commands: $config_commands @@ -20641,26 +20631,6 @@ do "config/openaxiom-c-macros.h") CONFIG_HEADERS="$CONFIG_HEADERS config/openaxiom-c-macros.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "$oa_incdir/hash-table") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/hash-table:src/utils/hash-table.H" ;; - "$oa_incdir/string-pool") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/string-pool:src/utils/string-pool.H" ;; - "$oa_incdir/diagnostics") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/diagnostics:src/include/diagnostics.H" ;; - "$oa_incdir/dialect") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/dialect:src/include/dialect.H" ;; - "$oa_incdir/token-value") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/token-value:src/include/token-value.def" ;; - "$oa_incdir/token") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/token:src/include/token.H" ;; - "$oa_incdir/defaults") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/defaults:src/include/defaults.H" ;; - "$oa_incdir/structure") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/structure:src/include/structure.H" ;; - "$oa_incdir/iterator") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/iterator:src/include/iterator.H" ;; - "$oa_incdir/storage") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/storage:src/include/storage.H" ;; - "$oa_incdir/Charset") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/Charset:src/include/Charset.H" ;; - "$oa_incdir/FileMapping") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/FileMapping:src/include/FileMapping.H" ;; - "$oa_incdir/SourceFile") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/SourceFile:src/include/SourceFile.H" ;; - "$oa_incdir/Input") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/Input:src/include/Input.H" ;; - "$oa_incdir/vm") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/vm:src/include/vm.H" ;; - "$oa_incdir/sexpr") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/sexpr:src/include/sexpr.H" ;; - "$oa_incdir/Lisp") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/Lisp:src/include/Lisp.H" ;; - "$oa_incdir/InputFragment") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/InputFragment:src/include/InputFragment.h" ;; - "$oa_incdir/Constructor") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/Constructor:src/include/Constructor.H" ;; - "$oa_incdir/Database") CONFIG_LINKS="$CONFIG_LINKS $oa_incdir/Database:src/include/Database.H" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/utils/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/Makefile" ;; @@ -20699,7 +20669,6 @@ done if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi @@ -20997,7 +20966,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_HEADERS" -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :L $CONFIG_LINKS :C $CONFIG_COMMANDS" +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" shift for ac_tag do @@ -21274,38 +21243,7 @@ $as_echo X"$_am_arg" | } s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :L) - # - # CONFIG_LINK - # - if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then - : - else - # Prefer the file from the source tree if names are identical. - if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then - ac_source=$srcdir/$ac_source - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5 -$as_echo "$as_me: linking $ac_source to $ac_file" >&6;} - - if test ! -r "$ac_source"; then - as_fn_error $? "$ac_source: file not found" "$LINENO" 5 - fi - rm -f "$ac_file" - - # Try a relative symlink, then a hard link, then a copy. - case $ac_source in - [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;; - *) ac_rel_source=$ac_top_build_prefix$ac_source ;; - esac - ln -s "$ac_rel_source" "$ac_file" 2>/dev/null || - ln "$ac_source" "$ac_file" 2>/dev/null || - cp -p "$ac_source" "$ac_file" || - as_fn_error $? "cannot link or copy $ac_source to $ac_file" "$LINENO" 5 - fi - ;; :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; diff --git a/configure.ac b/configure.ac index 60b58d2c..fbbf3ebc 100644 --- a/configure.ac +++ b/configure.ac @@ -115,7 +115,6 @@ OPENAXIOM_FFI_TYPE_TABLE OPENAXIOM_GCL_BUILD_OPTIONS OPENAXIOM_CHECK_MM OPENAXIOM_CHECK_MISC -OPENAXIOM_LINK_FILES ## We are ready to instantiate makefiles. AC_CONFIG_FILES([ diff --git a/src/include/Charset.H b/src/include/open-axiom/Charset index 58fa9ea8..58fa9ea8 100644 --- a/src/include/Charset.H +++ b/src/include/open-axiom/Charset diff --git a/src/include/Constructor.H b/src/include/open-axiom/Constructor index bfab3940..bfab3940 100644 --- a/src/include/Constructor.H +++ b/src/include/open-axiom/Constructor diff --git a/src/include/Database.H b/src/include/open-axiom/Database index cea082c8..cea082c8 100644 --- a/src/include/Database.H +++ b/src/include/open-axiom/Database diff --git a/src/include/FileMapping.H b/src/include/open-axiom/FileMapping index 0c836efb..0c836efb 100644 --- a/src/include/FileMapping.H +++ b/src/include/open-axiom/FileMapping diff --git a/src/include/Input.H b/src/include/open-axiom/Input index fa4555b8..fa4555b8 100644 --- a/src/include/Input.H +++ b/src/include/open-axiom/Input diff --git a/src/include/InputFragment.h b/src/include/open-axiom/InputFragment index 7f317973..7f317973 100644 --- a/src/include/InputFragment.h +++ b/src/include/open-axiom/InputFragment diff --git a/src/include/Lisp.H b/src/include/open-axiom/Lisp index a189dd38..a189dd38 100644 --- a/src/include/Lisp.H +++ b/src/include/open-axiom/Lisp diff --git a/src/include/SourceFile.H b/src/include/open-axiom/SourceFile index 41b085a3..41b085a3 100644 --- a/src/include/SourceFile.H +++ b/src/include/open-axiom/SourceFile diff --git a/src/include/defaults.H b/src/include/open-axiom/defaults index db399419..db399419 100644 --- a/src/include/defaults.H +++ b/src/include/open-axiom/defaults diff --git a/src/include/diagnostics.H b/src/include/open-axiom/diagnostics index 9cb0fce1..9cb0fce1 100644 --- a/src/include/diagnostics.H +++ b/src/include/open-axiom/diagnostics diff --git a/src/include/dialect.H b/src/include/open-axiom/dialect index bcfddd04..bcfddd04 100644 --- a/src/include/dialect.H +++ b/src/include/open-axiom/dialect diff --git a/src/utils/hash-table.H b/src/include/open-axiom/hash-table index d74c7760..d74c7760 100644 --- a/src/utils/hash-table.H +++ b/src/include/open-axiom/hash-table diff --git a/src/include/iterator.H b/src/include/open-axiom/iterator index 048dc67c..048dc67c 100644 --- a/src/include/iterator.H +++ b/src/include/open-axiom/iterator diff --git a/src/include/sexpr.H b/src/include/open-axiom/sexpr index 6920e436..6920e436 100644 --- a/src/include/sexpr.H +++ b/src/include/open-axiom/sexpr diff --git a/src/include/storage.H b/src/include/open-axiom/storage index e414dec2..e414dec2 100644 --- a/src/include/storage.H +++ b/src/include/open-axiom/storage diff --git a/src/utils/string-pool.H b/src/include/open-axiom/string-pool index 1f746e6d..1f746e6d 100644 --- a/src/utils/string-pool.H +++ b/src/include/open-axiom/string-pool diff --git a/src/include/structure.H b/src/include/open-axiom/structure index 33c084f2..33c084f2 100644 --- a/src/include/structure.H +++ b/src/include/open-axiom/structure diff --git a/src/include/token.H b/src/include/open-axiom/token index b57b69d6..b57b69d6 100644 --- a/src/include/token.H +++ b/src/include/open-axiom/token diff --git a/src/include/token-value.def b/src/include/open-axiom/token-value index 9a949b86..9a949b86 100644 --- a/src/include/token-value.def +++ b/src/include/open-axiom/token-value diff --git a/src/include/vm.H b/src/include/open-axiom/vm index 3bb62250..3bb62250 100644 --- a/src/include/vm.H +++ b/src/include/open-axiom/vm diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in index 18806e1d..cde398ed 100644 --- a/src/utils/Makefile.in +++ b/src/utils/Makefile.in @@ -220,8 +220,7 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/hash-table.H \ - $(srcdir)/string-pool.H $(top_srcdir)/config/depcomp \ +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp \ $(top_srcdir)/config/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ |