diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | extension/ChangeLog | 6 | ||||
| -rw-r--r-- | extension/Makefile.am | 62 |
4 files changed, 35 insertions, 39 deletions
@@ -1,5 +1,10 @@ 2012-03-25 Andrew J. Schorr <aschorr@telemetry-investments.com> + * configure.ac (AC_DISABLE_STATIC): Add this to avoid building useless + static extension libraries. + +2012-03-25 Andrew J. Schorr <aschorr@telemetry-investments.com> + * TODO.xgawk: New file listing completed and pending xgawk enhancements. 2012-03-24 Andrew J. Schorr <aschorr@telemetry-investments.com> diff --git a/configure.ac b/configure.ac index a7de26af..ac9b4d9b 100644 --- a/configure.ac +++ b/configure.ac @@ -68,6 +68,7 @@ AC_PROG_LN_S AC_PROG_CC AC_PROG_CPP AC_PROG_LIBTOOL +AC_DISABLE_STATIC AC_OBJEXT AC_EXEEXT diff --git a/extension/ChangeLog b/extension/ChangeLog index 2287434e..e0a6245b 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,5 +1,11 @@ 2012-03-25 Andrew J. Schorr <aschorr@telemetry-investments.com> + * Makefile.am: Major cleanup. Use libtool options -module and + -avoid-version to create the modules properly without my local hack + to override the default behavior. + +2012-03-25 Andrew J. Schorr <aschorr@telemetry-investments.com> + * .gitignore: New file to ignore files created by libtool (including binaries and associated metadata). diff --git a/extension/Makefile.am b/extension/Makefile.am index fc806796..a2f47229 100644 --- a/extension/Makefile.am +++ b/extension/Makefile.am @@ -25,45 +25,29 @@ INCLUDES = -I.. -I$(top_srcdir) -lib_LTLIBRARIES = \ - libarrayparm.la \ - libfilefuncs.la \ - libfork.la \ - libordchr.la \ - libreadfile.la \ - libtestarg.la - -# The arrayparm, zaxxon, and testarg libraries do not do anything useful, -# so do not install them... - -install_libraries = \ - libfilefuncs.la \ - libfork.la \ - libordchr.la \ - libreadfile.la - -libarrayparm_la_SOURCES = arrayparm.c -libfilefuncs_la_SOURCES = filefuncs.c -libfork_la_SOURCES = fork.c -libordchr_la_SOURCES = ordchr.c -libreadfile_la_SOURCES = readfile.c -libtestarg_la_SOURCES = testarg.c - -install: $(install_libraries) - for p in $(install_libraries); do \ - . ./$$p ; \ - f=`echo $$dlname | sed -e 's/^lib//' -e 's/\.0//g'` ; \ - echo "Installing $$dlname in $(DESTDIR)$(pkgextensiondir)/$$f" ; \ - $(INSTALL_PROGRAM) .libs/$$dlname $(DESTDIR)$(pkgextensiondir)/$$f ; \ - done - -uninstall: $(install_libraries) - for p in $(install_libraries); do \ - . ./$$p ; \ - f=`echo $$dlname | sed -e 's/^lib//' -e 's/\.0//g'` ; \ - echo "Removing $$dlname in $(DESTDIR)$(pkgextensiondir)/$$f" ; \ - rm -f $(DESTDIR)$(pkgextensiondir)/$$f ; \ - done +# The arrayparm, zaxxon (dl), and testarg libraries do not do anything useful, +# so do not build or install them. + +# Note: rwarray does not currently compile. + +pkgextension_LTLIBRARIES = \ + filefuncs.la \ + fork.la \ + ordchr.la \ + readfile.la + +MY_MODULE_FLAGS = -module -avoid-version + +filefuncs_la_SOURCES = filefuncs.c +filefuncs_la_LDFLAGS = $(MY_MODULE_FLAGS) +fork_la_SOURCES = fork.c +fork_la_LDFLAGS = $(MY_MODULE_FLAGS) +ordchr_la_SOURCES = ordchr.c +ordchr_la_LDFLAGS = $(MY_MODULE_FLAGS) +readfile_la_SOURCES = readfile.c +readfile_la_LDFLAGS = $(MY_MODULE_FLAGS) +#rwarray_la_SOURCES = rwarray.c +#rwarray_la_LDFLAGS = $(MY_MODULE_FLAGS) EXTRA_DIST = \ ChangeLog \ |