luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-10 12:55:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unify the Makefiles. In glib only scan glib folders.

Browse Source 
* glib/Makefile.am:
	* gobject/Makefile.am:
	  Unify the Makefiles. In glib only scan glib folders.


svn path=/trunk/; revision=7094
This commit is contained in:
Stefan Kost 2008-06-22 16:34:30 +00:00
parent c9f64ca9dd
commit ba729be6c1
3 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/reference/ChangeLog
View File

@ -1,3 +1,9 @@
2008-06-22 Stefan Kost <ensonic@users.sf.net>
* glib/Makefile.am:
* gobject/Makefile.am:
Unify the Makefiles. In glib only scan glib folders.
2008-06-16 Ross Burton <ross@burtonini.com> 2008-06-16 Ross Burton <ross@burtonini.com>
* gio/gio-sections.txt: * gio/gio-sections.txt:

13
docs/reference/glib/Makefile.am
View File

@ -1,5 +1,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl #include $(top_srcdir)/Makefile.decl
AUTOMAKE_OPTIONS = 1.6 AUTOMAKE_OPTIONS = 1.6
# The name of the module. # The name of the module.
@ -8,11 +9,14 @@ DOC_MODULE=glib
# The top-level SGML file. # The top-level SGML file.
DOC_MAIN_SGML_FILE=glib-docs.sgml DOC_MAIN_SGML_FILE=glib-docs.sgml
# The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../../../glib ../../../gmodule
# Extra options to supply to gtkdoc-scan # Extra options to supply to gtkdoc-scan
SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
# The directory containing the source code. Relative to $(srcdir) # Extra options to supply to gtkdoc-mkdb
DOC_SOURCE_DIR=../../.. MKDB_OPTIONS=--sgml-mode --output-format=xml
# Used for dependencies # Used for dependencies
HFILE_GLOB=$(top_srcdir)/glib/*.h $(top_srcdir)/gmodule/*.h HFILE_GLOB=$(top_srcdir)/glib/*.h $(top_srcdir)/gmodule/*.h
@ -43,9 +47,6 @@ IGNORE_HFILES= \
pcre \ pcre \
update-pcre update-pcre
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS=--sgml-mode --output-format=xml
# Images to copy into HTML directory # Images to copy into HTML directory
HTML_IMAGES = \ HTML_IMAGES = \
file-name-encodings.png \ file-name-encodings.png \

23
docs/reference/gobject/Makefile.am
View File

@ -2,19 +2,25 @@
# we have no tests here # we have no tests here
#include $(top_srcdir)/Makefile.decl #include $(top_srcdir)/Makefile.decl
AUTOMAKE_OPTIONS = 1.6
# The name of the module. # The name of the module.
DOC_MODULE=gobject DOC_MODULE=gobject
# The top-level SGML file. # The top-level SGML file.
DOC_MAIN_SGML_FILE=gobject-docs.sgml DOC_MAIN_SGML_FILE=gobject-docs.sgml
# Extra options to supply to gtkdoc-scan
SCAN_OPTIONS=--deprecated-guards=G_DISABLE_DEPRECATED \
--ignore-decorators=G_GNUC_INTERNAL
# The directory containing the source code. Relative to $(srcdir) # The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../../../gobject DOC_SOURCE_DIR=../../../gobject
# Extra options to supply to gtkdoc-scan
SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \
--ignore-decorators=G_GNUC_INTERNAL
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS=--sgml-mode --output-format=xml
# Used for dependencies
HFILE_GLOB=$(top_srcdir)/gobject/*.h HFILE_GLOB=$(top_srcdir)/gobject/*.h
CFILE_GLOB=$(top_srcdir)/gobject/*.c CFILE_GLOB=$(top_srcdir)/gobject/*.c
@ -34,8 +40,9 @@ GTKDOC_LIBS = \
$(top_builddir)/glib/libglib-2.0.la \ $(top_builddir)/glib/libglib-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la $(top_builddir)/gobject/libgobject-2.0.la
# Extra options to supply to gtkdoc-mkdb # Images to copy into HTML directory
MKDB_OPTIONS=--sgml-mode HTML_IMAGES = \
$(srcdir)/images/glue.png
# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE) # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
content_files = version.xml \ content_files = version.xml \
@ -49,10 +56,6 @@ content_files = version.xml \
tut_intro.xml \ tut_intro.xml \
tut_tools.xml tut_tools.xml
# Images to copy into HTML directory
HTML_IMAGES = \
$(srcdir)/images/glue.png
# Extra options to supply to gtkdoc-fixref # Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../glib/html FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../glib/html