diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2009-12-08 14:58:19 -0500 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2009-12-08 14:58:19 -0500 |
| commit | 199da20b7b02e718a87ccc9c433e3df3e01adb91 (patch) | |
| tree | af910e495e743b3817de6c5bc9f26ef80faf9b02 | |
| parent | 5ebc39ab98b0e099eb68b87e16b03bbc2f8a2a85 (diff) | |
| download | ayatana-indicator-application-199da20b7b02e718a87ccc9c433e3df3e01adb91.tar.gz ayatana-indicator-application-199da20b7b02e718a87ccc9c433e3df3e01adb91.tar.bz2 ayatana-indicator-application-199da20b7b02e718a87ccc9c433e3df3e01adb91.zip | |
Fixes for make distcheck and default configure args
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | docs/reference/Makefile.am | 15 |
3 files changed, 18 insertions, 10 deletions
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"; \ @@ -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 |