Name the src/libpspp convenience library consistently.

src/libpspp.la and src/libpspp/libpspp.la have the same name,
although they are in different directories.  This seems unduly
confusing.  This commit renames the latter to liblibpspp.la, which
is at least different from libpspp.la and is also consistent with
the naming of the other libtool convenience libraries as
lib<directory>.la.

diff --git a/src/automake.mk b/src/automake.mk
index 522664964c4126bbcce5d387d603fbd197ba02ad..3f56eb5c792289e1aad567cb5492ee963ce2fe39 100644 (file)
--- a/src/automake.mk
+++ b/src/automake.mk
@@ -18,7 +18,7 @@ src_libpspp_core_la_LDFLAGS = -release $(VERSION)
 
 src_libpspp_core_la_LIBADD = \
        src/data/libdata.la \
 
 src_libpspp_core_la_LIBADD = \
        src/data/libdata.la \

-       src/libpspp/libpspp.la \
+       src/libpspp/liblibpspp.la \

        $(LIBXML2_LIBS) $(PG_LIBS) \
        gl/libgl.la
 
        $(LIBXML2_LIBS) $(PG_LIBS) \
        gl/libgl.la
 

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 805887410b13a31b9e185ab9c7a51c6e5080a080..567e56a492ad8b08530176f0f0618c1c2fb58dc1 100644 (file)
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 

-noinst_LTLIBRARIES += src/libpspp/libpspp.la
+noinst_LTLIBRARIES += src/libpspp/liblibpspp.la

 
 

-src_libpspp_libpspp_la_SOURCES = \
+src_libpspp_liblibpspp_la_SOURCES = \

        src/libpspp/abt.c \
        src/libpspp/abt.h \
        src/libpspp/argv-parser.c \
        src/libpspp/abt.c \
        src/libpspp/abt.h \
        src/libpspp/argv-parser.c \


@@ -97,9 +97,11 @@ src_libpspp_libpspp_la_SOURCES = \
 
 DISTCLEANFILES+=src/libpspp/version.c
 
 
 DISTCLEANFILES+=src/libpspp/version.c
 

-src_libpspp_libpspp_la_CPPFLAGS = -I $(top_srcdir)/src/libpspp $(AM_CPPFLAGS)
+src_libpspp_liblibpspp_la_CPPFLAGS = \
+       -I $(top_srcdir)/src/libpspp \
+       $(AM_CPPFLAGS)

 
 

-nodist_src_libpspp_libpspp_la_SOURCES = src/libpspp/version.c
+nodist_src_libpspp_liblibpspp_la_SOURCES = src/libpspp/version.c

 
 src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile
        @$(MKDIR_P) src/libpspp
 
 src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile
        @$(MKDIR_P) src/libpspp

diff --git a/tests/automake.mk b/tests/automake.mk
index 1a9ef8442120a5de7db357fc540b9320e63b155a..16a0d35202242e76e3cda5aa96dcdd17c7d99af8 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -55,12 +55,14 @@ tests_libpspp_llx_test_CFLAGS = $(AM_CFLAGS)
 
 tests_libpspp_encoding_guesser_test_SOURCES = \
        tests/libpspp/encoding-guesser-test.c
 
 tests_libpspp_encoding_guesser_test_SOURCES = \
        tests/libpspp/encoding-guesser-test.c

-tests_libpspp_encoding_guesser_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_encoding_guesser_test_LDADD = \
+       src/libpspp/liblibpspp.la \
+       gl/libgl.la

 
 tests_libpspp_heap_test_SOURCES = \
        tests/libpspp/heap-test.c
 tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_heap_test_SOURCES = \
        tests/libpspp/heap-test.c
 tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10

-tests_libpspp_heap_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_heap_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la

 
 tests_libpspp_hmap_test_SOURCES = \
        src/libpspp/hmap.c \
 
 tests_libpspp_hmap_test_SOURCES = \
        src/libpspp/hmap.c \


@@ -74,7 +76,7 @@ tests_libpspp_hmapx_test_SOURCES = \
 tests_libpspp_hmapx_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_i18n_test_SOURCES = tests/libpspp/i18n-test.c
 tests_libpspp_hmapx_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_i18n_test_SOURCES = tests/libpspp/i18n-test.c

-tests_libpspp_i18n_test_LDADD = src/libpspp/libpspp.la gl/libgl.la 
+tests_libpspp_i18n_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la 

 
 tests_libpspp_abt_test_SOURCES = \
        src/libpspp/abt.c \
 
 tests_libpspp_abt_test_SOURCES = \
        src/libpspp/abt.c \


@@ -95,21 +97,21 @@ tests_libpspp_range_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 tests_libpspp_range_set_test_SOURCES = \
        tests/libpspp/range-set-test.c
 tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 tests_libpspp_range_set_test_SOURCES = \
        tests/libpspp/range-set-test.c
 tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10

-tests_libpspp_range_set_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_range_set_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la

 
 tests_libpspp_str_test_SOURCES = \
        tests/libpspp/str-test.c
 
 tests_libpspp_str_test_SOURCES = \
        tests/libpspp/str-test.c

-tests_libpspp_str_test_LDADD = src/libpspp/libpspp.la gl/libgl.la 
+tests_libpspp_str_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la 

 
 tests_libpspp_string_map_test_SOURCES = \
        tests/libpspp/string-map-test.c
 tests_libpspp_string_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_string_map_test_SOURCES = \
        tests/libpspp/string-map-test.c
 tests_libpspp_string_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10

-tests_libpspp_string_map_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_string_map_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la

 
 tests_libpspp_stringi_map_test_SOURCES = \
        tests/libpspp/stringi-map-test.c
 tests_libpspp_stringi_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_stringi_map_test_SOURCES = \
        tests/libpspp/stringi-map-test.c
 tests_libpspp_stringi_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10

-tests_libpspp_stringi_map_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_stringi_map_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la

 
 tests_libpspp_string_set_test_SOURCES = \
        src/libpspp/hash-functions.c \
 
 tests_libpspp_string_set_test_SOURCES = \
        src/libpspp/hash-functions.c \


@@ -121,25 +123,25 @@ tests_libpspp_string_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 tests_libpspp_stringi_set_test_SOURCES = \
        tests/libpspp/stringi-set-test.c
 tests_libpspp_stringi_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 tests_libpspp_stringi_set_test_SOURCES = \
        tests/libpspp/stringi-set-test.c
 tests_libpspp_stringi_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10

-tests_libpspp_stringi_set_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_stringi_set_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la

 
 tests_libpspp_tower_test_SOURCES = \
        tests/libpspp/tower-test.c
 tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_tower_test_SOURCES = \
        tests/libpspp/tower-test.c
 tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10

-tests_libpspp_tower_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_tower_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la

 
 tests_libpspp_u8_istream_test_SOURCES = tests/libpspp/u8-istream-test.c
 
 tests_libpspp_u8_istream_test_SOURCES = tests/libpspp/u8-istream-test.c

-tests_libpspp_u8_istream_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_u8_istream_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la

 
 tests_libpspp_sparse_array_test_SOURCES = \
        tests/libpspp/sparse-array-test.c 
 tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_sparse_array_test_SOURCES = \
        tests/libpspp/sparse-array-test.c 
 tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10

-tests_libpspp_sparse_array_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_sparse_array_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la

 
 tests_libpspp_sparse_xarray_test_SOURCES = \
        tests/libpspp/sparse-xarray-test.c
 tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_sparse_xarray_test_SOURCES = \
        tests/libpspp/sparse-xarray-test.c
 tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10

-tests_libpspp_sparse_xarray_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_sparse_xarray_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la

 
 tests_data_inexactify_SOURCES = tests/data/inexactify.c
 
 
 tests_data_inexactify_SOURCES = tests/data/inexactify.c
 


@@ -149,7 +151,7 @@ tests_language_lexer_command_name_test_SOURCES = \
        src/language/lexer/command-name.c \
        tests/language/lexer/command-name-test.c
 tests_language_lexer_command_name_test_LDADD = \
        src/language/lexer/command-name.c \
        tests/language/lexer/command-name-test.c
 tests_language_lexer_command_name_test_LDADD = \

-       src/libpspp/libpspp.la \
+       src/libpspp/liblibpspp.la \

        gl/libgl.la 
 tests_language_lexer_command_name_test_CFLAGS = $(AM_CFLAGS)
 
        gl/libgl.la 
 tests_language_lexer_command_name_test_CFLAGS = $(AM_CFLAGS)
 


@@ -163,7 +165,7 @@ tests_language_lexer_scan_test_SOURCES = \
        tests/language/lexer/scan-test.c
 tests_language_lexer_scan_test_CFLAGS = $(AM_CFLAGS)
 tests_language_lexer_scan_test_LDADD = \
        tests/language/lexer/scan-test.c
 tests_language_lexer_scan_test_CFLAGS = $(AM_CFLAGS)
 tests_language_lexer_scan_test_LDADD = \

-       src/libpspp/libpspp.la \
+       src/libpspp/liblibpspp.la \

        gl/libgl.la 
 
 check_PROGRAMS += tests/language/lexer/segment-test
        gl/libgl.la 
 
 check_PROGRAMS += tests/language/lexer/segment-test


@@ -174,7 +176,7 @@ tests_language_lexer_segment_test_SOURCES = \
        tests/language/lexer/segment-test.c
 tests_language_lexer_segment_test_CFLAGS = $(AM_CFLAGS)
 tests_language_lexer_segment_test_LDADD = \
        tests/language/lexer/segment-test.c
 tests_language_lexer_segment_test_CFLAGS = $(AM_CFLAGS)
 tests_language_lexer_segment_test_LDADD = \

-       src/libpspp/libpspp.la \
+       src/libpspp/liblibpspp.la \

        gl/libgl.la 
 
 check_PROGRAMS += tests/libpspp/zip-test
        gl/libgl.la 
 
 check_PROGRAMS += tests/libpspp/zip-test


@@ -182,7 +184,7 @@ tests_libpspp_zip_test_SOURCES = \
        tests/libpspp/zip-test.c
 tests_libpspp_zip_test_CFLAGS = $(AM_CFLAGS)
 tests_libpspp_zip_test_LDADD = \
        tests/libpspp/zip-test.c
 tests_libpspp_zip_test_CFLAGS = $(AM_CFLAGS)
 tests_libpspp_zip_test_LDADD = \

-       src/libpspp/libpspp.la \
+       src/libpspp/liblibpspp.la \

        gl/libgl.la 
 
 
        gl/libgl.la