From 9306d83d657fe880f6dc6ef039a9b07e05f0ae90 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Sat, 5 Dec 2009 01:21:59 -0500 Subject: generate gtk-doc --- autogen.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'autogen.sh') diff --git a/autogen.sh b/autogen.sh index 6480bd3..beaeed7 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,5 +7,8 @@ which gnome-autogen.sh || { exit 1 } +gtkdocize || exit 1 + USE_GNOME2_MACROS=1 \ -. gnome-autogen.sh +USE_COMMON_DOC_BUILD=yes \ +. gnome-autogen.sh --enable-gtk-doc -- cgit v1.2.3 From fb20a3193d6ed369e13125d86177636b2b78cbf2 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Sat, 5 Dec 2009 01:26:08 -0500 Subject: remove --enable-gtk-doc from autogen.sh --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'autogen.sh') diff --git a/autogen.sh b/autogen.sh index beaeed7..e51dce6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -11,4 +11,4 @@ gtkdocize || exit 1 USE_GNOME2_MACROS=1 \ USE_COMMON_DOC_BUILD=yes \ -. gnome-autogen.sh --enable-gtk-doc +. gnome-autogen.sh -- cgit v1.2.3 From 43eac2628d3df98c7b9a79a6c79af2b9daa155a6 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 8 Dec 2009 14:18:31 -0500 Subject: don't run gtkdocize with autogen.sh --- autogen.sh | 2 -- 1 file changed, 2 deletions(-) (limited to 'autogen.sh') diff --git a/autogen.sh b/autogen.sh index e51dce6..8be8035 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,8 +7,6 @@ which gnome-autogen.sh || { exit 1 } -gtkdocize || exit 1 - USE_GNOME2_MACROS=1 \ USE_COMMON_DOC_BUILD=yes \ . gnome-autogen.sh -- cgit v1.2.3 From 199da20b7b02e718a87ccc9c433e3df3e01adb91 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 8 Dec 2009 14:58:19 -0500 Subject: Fixes for make distcheck and default configure args --- Makefile.am | 11 ++++++++--- autogen.sh | 2 +- docs/reference/Makefile.am | 15 +++++++++------ 3 files changed, 18 insertions(+), 10 deletions(-) (limited to 'autogen.sh') diff --git a/Makefile.am b/Makefile.am index 3c52a29..d63fda6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,15 @@ SUBDIRS = data \ src \ - docs \ example \ - tests + tests \ + docs -DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall --enable-gtk-doc +EXTRA_DIST = \ + gtk-doc.make \ + omf.make \ + xmldocs.make + +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-localinstall dist-hook: @if test -d "$(top_srcdir)/.bzr"; \ diff --git a/autogen.sh b/autogen.sh index 8be8035..741ac76 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,4 @@ which gnome-autogen.sh || { USE_GNOME2_MACROS=1 \ USE_COMMON_DOC_BUILD=yes \ -. gnome-autogen.sh +. gnome-autogen.sh --enable-gtk-doc diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index c0ec513..dbff206 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -22,14 +22,15 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml # gtk-doc will search all .c & .h files beneath here for inline comments # documenting the functions and macros. # e.g. DOC_SOURCE_DIR=../../../gtk -DOC_SOURCE_DIR=../../src +DOC_SOURCE_DIR=../../src/libappindicator # Extra options to pass to gtkdoc-scangobj. Not normally needed. SCANGOBJ_OPTIONS=--nogtkinit --type-init-func="g_type_init()" # Extra options to supply to gtkdoc-scan. # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" -SCAN_OPTIONS=--rebuild-types --rebuild-sections +#SCAN_OPTIONS=--rebuild-types --rebuild-sections +SCAN_OPTIONS= # Extra options to supply to gtkdoc-mkdb. # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml @@ -49,8 +50,8 @@ FIXXREF_OPTIONS= # Used for dependencies. The docs will be rebuilt if any of these change. # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB=$(top_srcdir)/src/libappindicator/*.h $(top_srcdir)/src/*.h -CFILE_GLOB=$(top_srcdir)/src/libappindicator/*.c $(top_srcdir)/src/*.c +HFILE_GLOB=$(top_srcdir)/src/libappindicator/*.h +CFILE_GLOB=$(top_srcdir)/src/libappindicator/*.c # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h @@ -74,8 +75,10 @@ expand_content_files= # signals and properties. # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src $(INDICATOR_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la $(top_builddir)/src/indicator_application_service-application-service-appstore.o $(top_builddir)/src/indicator_application_service-application-service-watcher.o +GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/libappindicator $(INDICATOR_CFLAGS) +GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la + +#GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la $(top_builddir)/src/indicator_application_service-application-service-appstore.o $(top_builddir)/src/indicator_application_service-application-service-watcher.o # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make -- cgit v1.2.3 From 0c816c327a0d9a06ef21e858d738e5ef79338a37 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 8 Dec 2009 15:10:33 -0500 Subject: Clean up some cruft I left around --- autogen.sh | 2 +- docs/reference/Makefile.am | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'autogen.sh') diff --git a/autogen.sh b/autogen.sh index 741ac76..8cf45c4 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,4 @@ which gnome-autogen.sh || { USE_GNOME2_MACROS=1 \ USE_COMMON_DOC_BUILD=yes \ -. gnome-autogen.sh --enable-gtk-doc +gnome-autogen.sh --enable-gtk-doc diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index dbff206..fba50ca 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -76,9 +76,8 @@ expand_content_files= # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/libappindicator $(INDICATOR_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la - #GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la $(top_builddir)/src/indicator_application_service-application-service-appstore.o $(top_builddir)/src/indicator_application_service-application-service-watcher.o +GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make -- cgit v1.2.3 From 65195973e8ad407e1cf3fddb3da0ace128b98542 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Wed, 9 Dec 2009 10:35:11 -0600 Subject: fix autogen.sh --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'autogen.sh') diff --git a/autogen.sh b/autogen.sh index 8cf45c4..741ac76 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,4 @@ which gnome-autogen.sh || { USE_GNOME2_MACROS=1 \ USE_COMMON_DOC_BUILD=yes \ -gnome-autogen.sh --enable-gtk-doc +. gnome-autogen.sh --enable-gtk-doc -- cgit v1.2.3