Fixes to makefiles so that LDFLAGS are not overwritten.

REvved micro version; preparing to branch for gnome-2-0.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@336 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 723be30..4251e91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-28  Bill Haneman <bill.haneman@sun.com>
+
+       * configure.in: incremented micro version.
+
+       * branched for gnome-2-0 (a gnome-2-0-0 branch already exists).
+
 2002-08-20  Bill Haneman <bill.haneman@sun.com>
 
        * HACKING: 

diff --git a/atk-bridge/Makefile.am b/atk-bridge/Makefile.am
index 94772a3..3773c3b 100644 (file)
--- a/atk-bridge/Makefile.am
+++ b/atk-bridge/Makefile.am
@@ -22,7 +22,7 @@ DEPS =        \
        $(libat-spi)
 
 
-LDFLAGS += -no-undefined -module -avoid-version
+LDFLAGS = @LDFLAGS@ -no-undefined -module -avoid-version
 
 libatk_bridge_la_LIBADD = $(ATK_BRIDGE_LIBS) ../libspi/libspi.la
 

diff --git a/configure.in b/configure.in
index be14ae5..17ebe3a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,9 +2,9 @@ AC_INIT(idl/Accessibility.idl)
 
 AT_SPI_MAJOR_VERSION=1
 AT_SPI_MINOR_VERSION=1
-AT_SPI_MICRO_VERSION=0
-AT_SPI_INTERFACE_AGE=0
-AT_SPI_BINARY_AGE=0
+AT_SPI_MICRO_VERSION=1
+AT_SPI_INTERFACE_AGE=1
+AT_SPI_BINARY_AGE=1
 AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION"
 AM_INIT_AUTOMAKE(at-spi, $AT_SPI_VERSION)
 AC_SUBST(AT_SPI_MAJOR_VERSION)

diff --git a/cspi/Makefile.am b/cspi/Makefile.am
index cf3c59e..4d9d6fc 100644 (file)
--- a/cspi/Makefile.am
+++ b/cspi/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = -I $(top_srcdir)           \
            $(X_CFLAGS)                \
            $(LIBCSPI_CFLAGS)
 
-LDFLAGS = $(LIBCSPI_LIBS) @LT_VERSION_INFO@
+LDFLAGS = @LDFLAGS@ $(LIBCSPI_LIBS) @LT_VERSION_INFO@
 
 LDADD =                                \
        ../libspi/libspi.la     \

diff --git a/libspi/Makefile.am b/libspi/Makefile.am
index c369e92..cf77e28 100644 (file)
--- a/libspi/Makefile.am
+++ b/libspi/Makefile.am
@@ -4,11 +4,11 @@ INCLUDES = -I$(top_srcdir)    \
            -I$(top_builddir)   \
            $(LIBSPI_CFLAGS)
 
-LDFLAGS = $(LIBSPI_LIBS) $(XTST_LIBS) @LT_VERSION_INFO@
+LDFLAGS = @LDFLAGS@ $(LIBSPI_LIBS) $(XTST_LIBS) @LT_VERSION_INFO@
 
 #DEBUG_CFLAGS=-DSPI_DEBUG
 
-CFLAGS += $(DEBUG_CFLAGS)
+CFLAGS = @CFLAGS@ $(DEBUG_CFLAGS)
 
 libspiincludedir = $(includedir)/at-spi-1.0/libspi
 
@@ -62,7 +62,7 @@ IDL_DEPS = \
 
 
 BUILT_SOURCES = $(IDL_OUT) Accessibility-imodule.c
-CLEANFILES+=$(IDL_OUT) Accessibility-imodule.c
+CLEANFILES+= $(IDL_OUT) Accessibility-imodule.c
 
 libspi_la_SOURCES =            \
        accessible.c            \