diff options
Diffstat (limited to 'extension')
| -rw-r--r-- | extension/ChangeLog | 12 | ||||
| -rw-r--r-- | extension/Makefile.am | 9 | ||||
| -rw-r--r-- | extension/Makefile.in | 12 |
3 files changed, 26 insertions, 7 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index 44fccd5e..5d9a194e 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,15 @@ +2017-03-07 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am (pkgextension_LTLIBRARIES): Remove testext.la, since it + does not make sense to install this library. + (noinst_LTLIBRARIES): New variable containing list of libraries to + build for testing purposes only. These libraries will not be installed. + Initially, it contains only testext.la. + (testext_la_LDFLAGS): Add "-rpath /foo" to convince automake/libtool + to build a shared version of this library. Since it is not being + installed, automake cannot use the final destination directory to + determine -rpath by itself. The value doesn't matter. + 2017-03-06 Andrew J. Schorr <aschorr@telemetry-investments.com> * readdir_test.c: Test extension using new get_record field_width diff --git a/extension/Makefile.am b/extension/Makefile.am index d1cd225c..6ea16f5d 100644 --- a/extension/Makefile.am +++ b/extension/Makefile.am @@ -45,11 +45,11 @@ pkgextension_LTLIBRARIES = \ revoutput.la \ revtwoway.la \ rwarray.la \ - testext.la \ time.la noinst_LTLIBRARIES = \ - readdir_test.la + readdir_test.la \ + testext.la MY_MODULE_FLAGS = -module -avoid-version -no-undefined # on Cygwin, gettext requires that we link with -lintl @@ -100,8 +100,11 @@ time_la_SOURCES = time.c time_la_LDFLAGS = $(MY_MODULE_FLAGS) time_la_LIBADD = $(MY_LIBS) +# N.B. Becaues we are not installing testext, we must specify -rpath in +# LDFLAGS to get automake to build a shared library, since it needs +# an installation path. testext_la_SOURCES = testext.c -testext_la_LDFLAGS = $(MY_MODULE_FLAGS) +testext_la_LDFLAGS = $(MY_MODULE_FLAGS) -rpath /foo testext_la_LIBADD = $(MY_LIBS) # N.B. Because we are not installing readdir_test, we must specify -rpath in diff --git a/extension/Makefile.in b/extension/Makefile.in index c3aba973..c0e2676b 100644 --- a/extension/Makefile.in +++ b/extension/Makefile.in @@ -526,11 +526,11 @@ pkgextension_LTLIBRARIES = \ revoutput.la \ revtwoway.la \ rwarray.la \ - testext.la \ time.la noinst_LTLIBRARIES = \ - readdir_test.la + readdir_test.la \ + testext.la MY_MODULE_FLAGS = -module -avoid-version -no-undefined # on Cygwin, gettext requires that we link with -lintl @@ -570,8 +570,12 @@ rwarray_la_LIBADD = $(MY_LIBS) time_la_SOURCES = time.c time_la_LDFLAGS = $(MY_MODULE_FLAGS) time_la_LIBADD = $(MY_LIBS) + +# N.B. Becaues we are not installing testext, we must specify -rpath in +# LDFLAGS to get automake to build a shared library, since it needs +# an installation path. testext_la_SOURCES = testext.c -testext_la_LDFLAGS = $(MY_MODULE_FLAGS) +testext_la_LDFLAGS = $(MY_MODULE_FLAGS) -rpath /foo testext_la_LIBADD = $(MY_LIBS) # N.B. Because we are not installing readdir_test, we must specify -rpath in @@ -731,7 +735,7 @@ rwarray.la: $(rwarray_la_OBJECTS) $(rwarray_la_DEPENDENCIES) $(EXTRA_rwarray_la_ $(AM_V_CCLD)$(rwarray_la_LINK) -rpath $(pkgextensiondir) $(rwarray_la_OBJECTS) $(rwarray_la_LIBADD) $(LIBS) testext.la: $(testext_la_OBJECTS) $(testext_la_DEPENDENCIES) $(EXTRA_testext_la_DEPENDENCIES) - $(AM_V_CCLD)$(testext_la_LINK) -rpath $(pkgextensiondir) $(testext_la_OBJECTS) $(testext_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(testext_la_LINK) $(testext_la_OBJECTS) $(testext_la_LIBADD) $(LIBS) time.la: $(time_la_OBJECTS) $(time_la_DEPENDENCIES) $(EXTRA_time_la_DEPENDENCIES) $(AM_V_CCLD)$(time_la_LINK) -rpath $(pkgextensiondir) $(time_la_OBJECTS) $(time_la_LIBADD) $(LIBS) |