From: padraigo Date: Wed, 11 Feb 2004 18:23:17 +0000 (+0000) Subject: 2004-02-11 Padraig O'Briain X-Git-Tag: AT_SPI2_ATK_2_12_0~1085 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=commitdiff_plain;h=b4127e4ae8b399fd36830902141570c0386e8e84 2004-02-11 Padraig O'Briain * autogen.sh: Require version 1.7 of automake. * configure.in: call GTK_DOC_CHECK([1.0]) * atk-bridge/Makefile.am: Remove use of LDFLAGS and CFLAGS * docs/reference/cspi/Makefile.am: Update to use new gtk-doc. * libspi/Makefile.am: Remove use of LDFLAGS and CFLAGS. * test/Makefile.am: Remove use of CFLAGS. This fixes bug #132987. git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@610 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- diff --git a/ChangeLog b/ChangeLog index 803dc37..8f28408 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2004-02-11 Padraig O'Briain + + * autogen.sh: Require version 1.7 of automake. + + * configure.in: call GTK_DOC_CHECK([1.0]) + + * atk-bridge/Makefile.am: Remove use of LDFLAGS and CFLAGS + + * docs/reference/cspi/Makefile.am: Update to use new gtk-doc. + + * libspi/Makefile.am: Remove use of LDFLAGS and CFLAGS. + + * test/Makefile.am: Remove use of CFLAGS. + + This fixes bug #132987. + 2004-02-11 Bill Haneman * reverted most of Tomasz' patch below, since it was breaking diff --git a/atk-bridge/Makefile.am b/atk-bridge/Makefile.am index b58a0ea..62ed4e1 100644 --- a/atk-bridge/Makefile.am +++ b/atk-bridge/Makefile.am @@ -21,9 +21,7 @@ DEPS = \ $(libORBit-2) \ $(libat-spi) - -LDFLAGS = @LDFLAGS@ -no-undefined -module -avoid-version - -libatk_bridge_la_LIBADD = $(ATK_BRIDGE_LIBS) $(top_builddir)/libspi/libspi.la - -CFLAGS += $(ATK_BRIDGE_CFLAGS) +libatk_bridge_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version \ + @LDFLAGS@ \ + $(top_builddir)/libspi/libspi.la diff --git a/autogen.sh b/autogen.sh index 72ded62..058c571 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,5 +5,6 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. PKG_NAME="at-spi" +REQUIRED_AUTOMAKE_VERSION=1.7 USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/configure.in b/configure.in index aaca12a..1b7b9e2 100644 --- a/configure.in +++ b/configure.in @@ -50,41 +50,7 @@ dnl internationalization support dnl ALL_LINGUAS="ar az be bn ca cs cy da de el eo es et eu fa fi fr he hi hr id is it ja ko lt mn ms ne nl nn no pl pt_BR pt ro ru sk sl sq sr@Latn sr sv uk vi zh_CN" dnl AM_GLIB_GNU_GETTEXT -AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false) - -gtk_doc_min_version=0.6 -if $GTKDOC ; then - gtk_doc_version=`gtkdoc-mkdb --version` - AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version]) - if perl < \$required_ver); -} -exit 0; -EOF - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - GTKDOC=false - fi -fi - -dnl Let people disable the gtk-doc stuff. -AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto) - -if test x$enable_gtk_doc = xauto ; then - if test x$GTKDOC = xtrue ; then - enable_gtk_doc=yes - else - enable_gtk_doc=no - fi -fi +GTK_DOC_CHECK ([1.0]) dnl NOTE: We need to use a separate automake conditional for this dnl to make this work with the tarballs. diff --git a/docs/reference/cspi/Makefile.am b/docs/reference/cspi/Makefile.am index ee9ab75..ed2d642 100644 --- a/docs/reference/cspi/Makefile.am +++ b/docs/reference/cspi/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -EXTRA_DIST = Makefile.am at-spi-cspi-docs.sgml at-spi-cspi-sections.txt +AUTOMAKE_OPTIONS = 1.6 # Files whose declarations are to be ignored (private) IGNORE_HFILES = spi-impl.h @@ -14,151 +14,23 @@ DOC_MAIN_SGML_FILE=at-spi-cspi-docs.sgml # The directory containing the source code (if it contains documentation). DOC_SOURCE_DIR=../../../cspi -# Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS=--output-format=xml +# Used for dependencies +HFILE_GLOB = $(top_srcdir)/cpsi/*.h +CFILE_GLOB = $(top_srcdir)/cspi/*.c -INSTALLDIR=$(prefix)/share/gtk-doc +# CFLAGS and LDFLAGS for compiling scan program. Only needed +# if $(DOC_MODULE).types is non-empty. +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(DEP_CFLAGS) -HTML_DIR = ${datadir}/gtk-doc/html +#GTKDOC_LIBS = $(top_builddir)/cspilibcspi.la -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - -# Images to copy into HTML directory -HTML_IMAGES = - -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE) +# gtkdoc-mkdb related varaibles +MKDB_OPTIONS = content_files = -# Other files to distribute -extra_files = - -#################################### -# Everything below here is generic # -#################################### - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) - -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - -EXTRA_DIST = \ - $(content_files) \ - $(extra_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).signals - -if ENABLE_GTK_DOC -all-local: html-build.stamp - -#### scan #### - -scan-build.stamp: $(HFILE_GLOB) - @echo '*** Scanning header files ***' - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp - @true - -#### templates #### - -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo '*** Rebuilding template files ***' - cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) - touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -#### sgml #### - -sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml - @echo '*** Building SGML ***' - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS) - touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo '*** Building HTML ***' - test -d $(srcdir)/html || mkdir $(srcdir)/html - cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo '-- Fixing Crossreferences' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - touch html-build.stamp -endif - -############## - -clean-local: - rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS) - -maintainer-clean-local: clean - cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) - (installfiles=`echo $(srcdir)/html/*.html`; \ - if test "$$installfiles" = '$(srcdir)/html/*.html'; \ - then echo '-- Nothing to install' ; \ - else \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ - fi) - -# -# Require gtk-doc when making dist -# -if ENABLE_GTK_DOC -dist-check-gtkdoc: -else -dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" - @false -endif - -dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/sgml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml - -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html - - images=$(HTML_IMAGES) ; \ - for i in $$images ; do \ - cp $(srcdir)/$$i $(distdir)/html ; \ - done +HTML_IMAGES = -.PHONY : html sgml templates scan dist-hook-local +include $(top_srcdir)/gtk-doc.make diff --git a/libspi/Makefile.am b/libspi/Makefile.am index 46cbb31..5f8fa5c 100644 --- a/libspi/Makefile.am +++ b/libspi/Makefile.am @@ -1,14 +1,14 @@ lib_LTLIBRARIES = libspi.la +#LIBSPI_DEBUG_CFLAGS=-DSPI_DEBUG + INCLUDES = -I$(top_srcdir) \ -I$(top_builddir) \ + $(LIBSPI_DEBUG_CFLAGS) \ $(LIBSPI_CFLAGS) -LDFLAGS = @LDFLAGS@ $(LIBSPI_LIBS) $(XTST_LIBS) @LT_VERSION_INFO@ - -#DEBUG_CFLAGS=-DSPI_DEBUG - -CFLAGS = @CFLAGS@ $(DEBUG_CFLAGS) +libspi_la_LDFLAGS = @LT_VERSION_INFO@ +libspi_la_LIBADD = $(LIBSPI_LIBS) $(XTST_LIBS) libspiincludedir = $(includedir)/at-spi-1.0/libspi diff --git a/test/Makefile.am b/test/Makefile.am index 31078d0..68d8d6a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -26,17 +26,16 @@ keysynth_demo_SOURCES = keysynth-demo.c test_simple_SOURCES = test-simple.c +DEBUG_CFLAGS=-DSPI_DEBUG + INCLUDES = -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/libspi \ -I$(top_builddir)/libspi \ -I$(top_srcdir)/cspi \ -I$(top_builddir)/cspi \ - $(TESTS_CFLAGS) - -DEBUG_CFLAGS=-DSPI_DEBUG - -CFLAGS += $(TESTS_CFLAGS) $(DEBUG_CFLAGS) + $(TESTS_CFLAGS) \ + $(DEBUG_CFLAGS) LDADD = ../libspi/libspi.la ../cspi/libcspi.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS)