From: billh Date: Tue, 16 Apr 2002 15:27:56 +0000 (+0000) Subject: Fixes for build on some platforms; in some cases the X11 libraries X-Git-Tag: AT_SPI2_ATK_2_12_0~1389 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=f83efc8376510623cfb49d7dfb60e2649047b5b9;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git Fixes for build on some platforms; in some cases the X11 libraries were not getting linked in. Added explicit inclusion of X_LIBS in makefiles. git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@273 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- diff --git a/ChangeLog b/ChangeLog index 2cd9f5d..e919d5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-04-16 Bill Haneman + + * registryd/Makefile.am: + * cspi/Makefile.am: + * cspi/bonobo/Makefile.am: + Add $(X_LIBS) to makefiles. + 2002-04-15 Bill Haneman * configure.in: diff --git a/cspi/Makefile.am b/cspi/Makefile.am index bb9b125..23aea9b 100644 --- a/cspi/Makefile.am +++ b/cspi/Makefile.am @@ -12,7 +12,7 @@ LDFLAGS = $(LIBCSPI_LIBS) @LT_VERSION_INFO@ LDADD = \ ../libspi/libspi.la \ - $(LIBCSPI_LIBS) + $(LIBCSPI_LIBS) $(X_LIBS) libcspidir = $(includedir)/at-spi-1.0/cspi libcspi_HEADERS = \ diff --git a/cspi/bonobo/Makefile.am b/cspi/bonobo/Makefile.am index 195e248..d51450e 100644 --- a/cspi/bonobo/Makefile.am +++ b/cspi/bonobo/Makefile.am @@ -9,4 +9,4 @@ libcspi_bonobo_la_SOURCES = \ cspi-bonobo-listener.c \ cspi-bonobo-listener.h -libcspi_bonobo_la_LIBADD = $(LIBCSPI_LIBS) +libcspi_bonobo_la_LIBADD = $(LIBCSPI_LIBS) $(X_LIBS) diff --git a/registryd/Makefile.am b/registryd/Makefile.am index 6ff4630..f61304d 100644 --- a/registryd/Makefile.am +++ b/registryd/Makefile.am @@ -15,7 +15,7 @@ at_spi_registryd_SOURCES = \ registry.c \ registry.h -LDADD = ../libspi/libspi.la $(XTST_LIBS) $(REGISTRYD_LIBS) +LDADD = ../libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(REGISTRYD_LIBS) serverinfodir = $(libdir)/bonobo/servers serverinfo_DATA = Accessibility_Registry.server