[Pspp-cvs] pspp src/data/por-file-writer.c src/ui/gui/auto... [simpler-proc]

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Branch:         simpler-proc
Changes by:     John Darrington <jmd>   07/04/25 03:49:41

Modified files:
        src/data       : por-file-writer.c 
        src/ui/gui     : automake.mk 
        src/ui/terminal: automake.mk 
        tests          : automake.mk 

Log message:
        Minor fix to get make check to work.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/por-file-writer.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.9.2.1&r2=1.9.2.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/automake.mk?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.21.2.3&r2=1.21.2.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/automake.mk?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.14.2.1&r2=1.14.2.2
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/automake.mk?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.27.2.10&r2=1.27.2.11

Patches:
Index: src/data/por-file-writer.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/por-file-writer.c,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -b -r1.9.2.1 -r1.9.2.2
--- src/data/por-file-writer.c  19 Mar 2007 21:36:24 -0000      1.9.2.1
+++ src/data/por-file-writer.c  25 Apr 2007 03:49:41 -0000      1.9.2.2
@@ -48,7 +48,6 @@
 #include <libpspp/str.h>
 #include <libpspp/version.h>
 
-#include "stat-macros.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

Index: src/ui/gui/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/automake.mk,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -u -b -r1.21.2.3 -r1.21.2.4
--- src/ui/gui/automake.mk      14 Apr 2007 05:04:23 -0000      1.21.2.3
+++ src/ui/gui/automake.mk      25 Apr 2007 03:49:41 -0000      1.21.2.4
@@ -30,7 +30,7 @@
        src/libpspp/libpspp.a \
        $(GTK_LIBS) \
        $(GLADE_LIBS) \
-       gl/libgl.a \
+       gl/libgl.la \
        @LIBINTL@ @LIBREADLINE@
 
 src_ui_gui_psppiredir = $(pkgdatadir)

Index: src/ui/terminal/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/automake.mk,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -b -r1.14.2.1 -r1.14.2.2
--- src/ui/terminal/automake.mk 19 Mar 2007 21:36:25 -0000      1.14.2.1
+++ src/ui/terminal/automake.mk 25 Apr 2007 03:49:41 -0000      1.14.2.2
@@ -30,6 +30,6 @@
        src/data/libdata.a \
        src/libpspp/libpspp.a \
        $(LIBICONV) \
-       gl/libgl.a \
+       gl/libgl.la \
        @LIBINTL@ @LIBREADLINE@
 

Index: tests/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/tests/automake.mk,v
retrieving revision 1.27.2.10
retrieving revision 1.27.2.11
diff -u -b -r1.27.2.10 -r1.27.2.11
--- tests/automake.mk   14 Apr 2007 23:04:00 -0000      1.27.2.10
+++ tests/automake.mk   25 Apr 2007 03:49:41 -0000      1.27.2.11
@@ -167,21 +167,21 @@
        src/libpspp/pool.c \
        src/libpspp/pool.h \
        tests/libpspp/heap-test.c
-tests_libpspp_heap_test_LDADD = gl/libgl.a @LIBINTL@
+tests_libpspp_heap_test_LDADD = gl/libgl.la @LIBINTL@
 tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_abt_test_SOURCES = \
        src/libpspp/abt.c \
        src/libpspp/abt.h \
        tests/libpspp/abt-test.c
-tests_libpspp_abt_test_LDADD = gl/libgl.a
+tests_libpspp_abt_test_LDADD = gl/libgl.la
 tests_libpspp_abt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_bt_test_SOURCES = \
        src/libpspp/bt.c \
        src/libpspp/bt.h \
        tests/libpspp/bt-test.c
-tests_libpspp_bt_test_LDADD = gl/libgl.a
+tests_libpspp_bt_test_LDADD = gl/libgl.la
 tests_libpspp_bt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_range_map_test_SOURCES = \
@@ -190,7 +190,7 @@
        src/libpspp/range-map.c \
        src/libpspp/range-map.h \
        tests/libpspp/range-map-test.c
-tests_libpspp_range_map_test_LDADD = gl/libgl.a
+tests_libpspp_range_map_test_LDADD = gl/libgl.la
 tests_libpspp_range_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_range_set_test_SOURCES = \
@@ -201,7 +201,7 @@
        src/libpspp/range-set.c \
        src/libpspp/range-set.h \
        tests/libpspp/range-set-test.c
-tests_libpspp_range_set_test_LDADD = gl/libgl.a @LIBINTL@
+tests_libpspp_range_set_test_LDADD = gl/libgl.la @LIBINTL@
 tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_tower_test_SOURCES = \
@@ -212,7 +212,7 @@
        src/libpspp/tower.c \
        src/libpspp/tower.h \
        tests/libpspp/tower-test.c
-tests_libpspp_tower_test_LDADD = gl/libgl.a @LIBINTL@
+tests_libpspp_tower_test_LDADD = gl/libgl.la @LIBINTL@
 tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_sparse_array_test_SOURCES = \
@@ -221,7 +221,7 @@
        src/libpspp/pool.c \
        src/libpspp/pool.h \
        tests/libpspp/sparse-array-test.c
-tests_libpspp_sparse_array_test_LDADD = gl/libgl.a
+tests_libpspp_sparse_array_test_LDADD = gl/libgl.la
 tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_formats_inexactify_SOURCES = tests/formats/inexactify.c