GNOME.org
 

[glom] Move list of libglom sources to separate file

commit e19fb2e9a9c10d9684371be1e8d26d255435209a
Author: Daniel Elstner <danielk openismus com>
Date:   Mon May 10 12:51:08 2010 +0200

    Move list of libglom sources to separate file
    
    * glom/libglom/filelist.am: New Automake include file, defining the
    lists of source and header files for building libglom.
    * Makefile_libglom.am: Include glom/libglom/filelist.am for the lists
    of header and source files, instead of listing them directly.
    * docs/libglom_reference/Makefile.am: Include the list of libglom
    source files from glom/libglom/filelist.am.
    (doc_input): Instead of naming a directory for Doxygen to search,
    explicitly define the Doxygen input to the list of all public libglom
    header files.

 ChangeLog                          |   14 +++
 Makefile_libglom.am                |  163 +++------------------------------
 docs/libglom_reference/Makefile.am |    6 +-
 glom/libglom/filelist.am           |  180 ++++++++++++++++++++++++++++++++++++
 4 files changed, 210 insertions(+), 153 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 34b2f5d..4b5bdbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2010-05-10  Daniel Elstner  <danielk openismus com>
 
+	Move list of libglom sources to separate file
+
+	* glom/libglom/filelist.am: New Automake include file, defining the
+	lists of source and header files for building libglom.
+	* Makefile_libglom.am: Include glom/libglom/filelist.am for the lists
+	of header and source files, instead of listing them directly.
+	* docs/libglom_reference/Makefile.am: Include the list of libglom
+	source files from glom/libglom/filelist.am.
+	(doc_input): Instead of naming a directory for Doxygen to search,
+	explicitly define the Doxygen input to the list of all public libglom
+	header files.
+
+2010-05-10  Daniel Elstner  <danielk openismus com>
+
 	Update Doxygen configuration for libglom reference
 
 	* docs/libglom_reference/Doxyfile.in: Correct strip prefixes and
diff --git a/Makefile_libglom.am b/Makefile_libglom.am
index a1a4524..9f4b911 100644
--- a/Makefile_libglom.am
+++ b/Makefile_libglom.am
@@ -1,4 +1,4 @@
-## Copyright (c) 2009  Openismus GmbH  <http://www.openismus.com/>
+## Copyright (c) 2009-2010  Openismus GmbH  <http://www.openismus.com/>
 ##
 ## This file is part of Glom.
 ##
@@ -15,171 +15,32 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+include $(top_srcdir)/glom/libglom/filelist.am
+
 libglom_includedir = $(includedir)/glom-$(GLOM_ABI_VERSION)/libglom
-libglom_include_HEADERS =			\
-	glom/libglom/appstate.h			\
-	glom/libglom/init.h			\
-	glom/libglom/libglom_config.h		\
-	glom/libglom/sharedptr.h		\
-	glom/libglom/standard_table_prefs_fields.h \
-	glom/libglom/utils.h \
-	glom/libglom/db_utils.h
+libglom_include_HEADERS = $(libglom_toplevel_headers)
 
 libglom_data_structure_includedir = $(libglom_includedir)/data_structure
-libglom_data_structure_include_HEADERS =			\
-	glom/libglom/data_structure/field.h			\
-	glom/libglom/data_structure/fieldtypes.h		\
-	glom/libglom/data_structure/foundset.h			\
-	glom/libglom/data_structure/has_title_singular.h        \
-	glom/libglom/data_structure/glomconversions.h		\
-	glom/libglom/data_structure/groupinfo.h			\
-	glom/libglom/data_structure/numeric_format.h		\
-	glom/libglom/data_structure/parameternamegenerator.h	\
-	glom/libglom/data_structure/print_layout.h		\
-	glom/libglom/data_structure/privileges.h		\
-	glom/libglom/data_structure/relationship.h		\
-	glom/libglom/data_structure/report.h			\
-	glom/libglom/data_structure/system_prefs.h		\
-	glom/libglom/data_structure/tableinfo.h			\
-	glom/libglom/data_structure/translatable_item.h
+libglom_data_structure_include_HEADERS = $(libglom_data_structure_headers)
 
 libglom_ds_layout_includedir = $(libglom_data_structure_includedir)/layout
-libglom_ds_layout_include_HEADERS =					\
-	glom/libglom/data_structure/layout/custom_title.h		\
-	glom/libglom/data_structure/layout/fieldformatting.h		\
-	glom/libglom/data_structure/layout/layoutgroup.h		\
-	glom/libglom/data_structure/layout/layoutitem.h			\
-	glom/libglom/data_structure/layout/layoutitem_button.h		\
-	glom/libglom/data_structure/layout/layoutitem_calendarportal.h	\
-	glom/libglom/data_structure/layout/layoutitem_field.h		\
-	glom/libglom/data_structure/layout/layoutitem_image.h		\
-	glom/libglom/data_structure/layout/layoutitem_line.h		\
-	glom/libglom/data_structure/layout/layoutitem_notebook.h	\
-	glom/libglom/data_structure/layout/layoutitem_placeholder.h	\
-	glom/libglom/data_structure/layout/layoutitem_portal.h		\
-	glom/libglom/data_structure/layout/layoutitem_text.h		\
-	glom/libglom/data_structure/layout/layoutitem_withformatting.h	\
-	glom/libglom/data_structure/layout/usesrelationship.h
+libglom_ds_layout_include_HEADERS = $(libglom_ds_layout_headers)
 
 libglom_ds_l_report_parts_includedir = $(libglom_ds_layout_includedir)/report_parts
-libglom_ds_l_report_parts_include_HEADERS =						\
-	glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h	\
-	glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h		\
-	glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.h		\
-	glom/libglom/data_structure/layout/report_parts/layoutitem_header.h		\
-	glom/libglom/data_structure/layout/report_parts/layoutitem_summary.h		\
-	glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h
+libglom_ds_l_report_parts_include_HEADERS = $(libglom_ds_l_report_parts_headers)
 
 libglom_document_includedir = $(libglom_includedir)/document
-libglom_document_include_HEADERS =		\
-	glom/libglom/document/document.h	\
-	glom/libglom/document/view.h
+libglom_document_include_HEADERS = $(libglom_document_headers)
 
 libglom_d_bakery_includedir = $(libglom_document_includedir)/bakery
-libglom_d_bakery_include_HEADERS =			\
-	glom/libglom/document/bakery/document.h		\
-	glom/libglom/document/bakery/document_xml.h
+libglom_d_bakery_include_HEADERS = $(libglom_d_bakery_headers)
 
 libglom_d_b_view_includedir = $(libglom_d_bakery_includedir)/view
-libglom_d_b_view_include_HEADERS =				\
-	glom/libglom/document/bakery/view/view.h		\
-	glom/libglom/document/bakery/view/view_composite.h	\
-	glom/libglom/document/bakery/view/viewbase.h
-
-glom_libglom_libglom_1_14_la_SOURCES =					\
-	glom/libglom/appstate.cc					\
-	glom/libglom/calcinprogress.cc					\
-	glom/libglom/calcinprogress.h					\
-	glom/libglom/connectionpool.cc					\
-	glom/libglom/connectionpool.h					\
-	glom/libglom/db_utils.cc						\
-	glom/libglom/db_utils.h					\
-	glom/libglom/glom_postgres.cc						\
-	glom/libglom/glom_postgres.h						\
-	glom/libglom/gst-package.c					\
-	glom/libglom/gst-package.h					\
-	glom/libglom/init.cc						\
-	glom/libglom/privs.cc						\
-	glom/libglom/privs.h						\
-	glom/libglom/spawn_with_feedback.cc				\
-	glom/libglom/spawn_with_feedback.h				\
-	glom/libglom/utils.cc						\
-	glom/libglom/utils.h						\
-	glom/libglom/connectionpool_backends/backend.cc			\
-	glom/libglom/connectionpool_backends/backend.h			\
-	glom/libglom/data_structure/field.cc				\
-	glom/libglom/data_structure/fieldtypes.cc			\
-	glom/libglom/data_structure/foundset.cc				\
-	glom/libglom/data_structure/glomconversions.cc			\
-	glom/libglom/data_structure/groupinfo.cc			\
-	glom/libglom/data_structure/has_title_singular.cc		\
-	glom/libglom/data_structure/numeric_format.cc			\
-	glom/libglom/data_structure/parameternamegenerator.cc		\
-	glom/libglom/data_structure/print_layout.cc			\
-	glom/libglom/data_structure/privileges.cc			\
-	glom/libglom/data_structure/relationship.cc			\
-	glom/libglom/data_structure/report.cc				\
-	glom/libglom/data_structure/system_prefs.cc			\
-	glom/libglom/data_structure/tableinfo.cc			\
-	glom/libglom/data_structure/translatable_item.cc		\
-	glom/libglom/data_structure/layout/custom_title.cc		\
-	glom/libglom/data_structure/layout/fieldformatting.cc		\
-	glom/libglom/data_structure/layout/layoutgroup.cc		\
-	glom/libglom/data_structure/layout/layoutitem.cc		\
-	glom/libglom/data_structure/layout/layoutitem_button.cc		\
-	glom/libglom/data_structure/layout/layoutitem_calendarportal.cc	\
-	glom/libglom/data_structure/layout/layoutitem_field.cc		\
-	glom/libglom/data_structure/layout/layoutitem_image.cc		\
-	glom/libglom/data_structure/layout/layoutitem_line.cc		\
-	glom/libglom/data_structure/layout/layoutitem_notebook.cc	\
-	glom/libglom/data_structure/layout/layoutitem_placeholder.cc	\
-	glom/libglom/data_structure/layout/layoutitem_portal.cc		\
-	glom/libglom/data_structure/layout/layoutitem_text.cc		\
-	glom/libglom/data_structure/layout/layoutitem_withformatting.cc		\
-	glom/libglom/data_structure/layout/usesrelationship.cc		\
-	glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc	\
-	glom/libglom/data_structure/layout/report_parts/layoutitem_footer.cc		\
-	glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.cc		\
-	glom/libglom/data_structure/layout/report_parts/layoutitem_header.cc		\
-	glom/libglom/data_structure/layout/report_parts/layoutitem_summary.cc		\
-	glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.cc	\
-	glom/libglom/document/document.cc				\
-	glom/libglom/document/bakery/document.cc			\
-	glom/libglom/document/bakery/document_xml.cc			\
-	glom/libglom/document/bakery/view/view.cc			\
-	glom/libglom/document/bakery/view/view_composite.cc		\
-	glom/libglom/document/bakery/view/viewbase.cc			\
-	glom/libglom/python_embed/py_glom_record.cc			\
-	glom/libglom/python_embed/py_glom_record.h			\
-	glom/libglom/python_embed/py_glom_related.cc			\
-	glom/libglom/python_embed/py_glom_related.h			\
-	glom/libglom/python_embed/py_glom_relatedrecord.cc		\
-	glom/libglom/python_embed/py_glom_relatedrecord.h		\
-	glom/libglom/python_embed/py_glom_ui.cc		\
-	glom/libglom/python_embed/py_glom_ui.h		\
-	glom/libglom/python_embed/py_glom_ui_callbacks.h		\
-	glom/libglom/python_embed/pygdavalue_conversions.cc		\
-	glom/libglom/python_embed/pygdavalue_conversions.h
+libglom_d_b_view_include_HEADERS = $(libglom_d_b_view_headers)
 
-glom_libglom_libglom_1_14_la_SOURCES +=				\
-	glom/libglom/connectionpool_backends/postgres.cc	\
-	glom/libglom/connectionpool_backends/postgres.h		\
-	glom/libglom/connectionpool_backends/postgres_central.cc\
-	glom/libglom/connectionpool_backends/postgres_central.h
-
-if !GLOM_ENABLE_CLIENT_ONLY
-glom_libglom_libglom_1_14_la_SOURCES +=				\
-	glom/libglom/connectionpool_backends/postgres_self.cc	\
-	glom/libglom/connectionpool_backends/postgres_self.h
-endif
-
-glom_libglom_libglom_1_14_la_SOURCES +=				\
-	glom/libglom/connectionpool_backends/sqlite.cc		\
-	glom/libglom/connectionpool_backends/sqlite.h
-
-glom_libglom_libglom_1_14_la_LIBADD = $(LIBGLOM_LIBS) $(PYTHON_LIBS) $(BOOST_PYTHON_LIBS)
+glom_libglom_libglom_1_14_la_SOURCES = $(libglom_sources)
+glom_libglom_libglom_1_14_la_LIBADD  = $(LIBGLOM_LIBS) $(PYTHON_LIBS) $(BOOST_PYTHON_LIBS)
 if HOST_WIN32
 glom_libglom_libglom_1_14_la_LIBADD += -lws2_32
 endif
-
 glom_libglom_libglom_1_14_la_LDFLAGS = -no-undefined
diff --git a/docs/libglom_reference/Makefile.am b/docs/libglom_reference/Makefile.am
index 39c3132..bd2599e 100644
--- a/docs/libglom_reference/Makefile.am
+++ b/docs/libglom_reference/Makefile.am
@@ -15,8 +15,10 @@
 ## You should have received a copy of the GNU General Public License
 ## along with Glom.  If not, see <http://www.gnu.org/licenses/>.
 
-book_name = libglom-$(GLOM_ABI_VERSION)
-doc_input = $(top_srcdir)/glom/libglom
+include $(top_srcdir)/glom/libglom/filelist.am
+
+book_name  = libglom-$(GLOM_ABI_VERSION)
+doc_input  = $(addprefix $(top_srcdir)/,$(libglom_headers))
 doc_outdir = .
 
 include $(top_srcdir)/doc-reference.am
diff --git a/glom/libglom/filelist.am b/glom/libglom/filelist.am
new file mode 100644
index 0000000..67bc30e
--- /dev/null
+++ b/glom/libglom/filelist.am
@@ -0,0 +1,180 @@
+## Copyright (c) 2010  Openismus GmbH  <http://www.openismus.com/>
+##
+## This file is part of Glom.
+##
+## Glom is free software: you can redistribute it and/or modify it
+## under the terms of the GNU General Public License as published
+## by the Free Software Foundation, either version 2 of the License,
+## or (at your option) any later version.
+##
+## Glom is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+## See the GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Public header files by installation directory:
+
+libglom_toplevel_headers =				\
+	glom/libglom/appstate.h				\
+	glom/libglom/init.h				\
+	glom/libglom/libglom_config.h			\
+	glom/libglom/sharedptr.h			\
+	glom/libglom/standard_table_prefs_fields.h	\
+	glom/libglom/utils.h				\
+	glom/libglom/db_utils.h
+
+libglom_data_structure_headers =				\
+	glom/libglom/data_structure/field.h			\
+	glom/libglom/data_structure/fieldtypes.h		\
+	glom/libglom/data_structure/foundset.h			\
+	glom/libglom/data_structure/has_title_singular.h        \
+	glom/libglom/data_structure/glomconversions.h		\
+	glom/libglom/data_structure/groupinfo.h			\
+	glom/libglom/data_structure/numeric_format.h		\
+	glom/libglom/data_structure/parameternamegenerator.h	\
+	glom/libglom/data_structure/print_layout.h		\
+	glom/libglom/data_structure/privileges.h		\
+	glom/libglom/data_structure/relationship.h		\
+	glom/libglom/data_structure/report.h			\
+	glom/libglom/data_structure/system_prefs.h		\
+	glom/libglom/data_structure/tableinfo.h			\
+	glom/libglom/data_structure/translatable_item.h
+
+libglom_ds_layout_headers =						\
+	glom/libglom/data_structure/layout/custom_title.h		\
+	glom/libglom/data_structure/layout/fieldformatting.h		\
+	glom/libglom/data_structure/layout/layoutgroup.h		\
+	glom/libglom/data_structure/layout/layoutitem.h			\
+	glom/libglom/data_structure/layout/layoutitem_button.h		\
+	glom/libglom/data_structure/layout/layoutitem_calendarportal.h	\
+	glom/libglom/data_structure/layout/layoutitem_field.h		\
+	glom/libglom/data_structure/layout/layoutitem_image.h		\
+	glom/libglom/data_structure/layout/layoutitem_line.h		\
+	glom/libglom/data_structure/layout/layoutitem_notebook.h	\
+	glom/libglom/data_structure/layout/layoutitem_placeholder.h	\
+	glom/libglom/data_structure/layout/layoutitem_portal.h		\
+	glom/libglom/data_structure/layout/layoutitem_text.h		\
+	glom/libglom/data_structure/layout/layoutitem_withformatting.h	\
+	glom/libglom/data_structure/layout/usesrelationship.h
+
+libglom_ds_l_report_parts_headers =							\
+	glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h	\
+	glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h		\
+	glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.h		\
+	glom/libglom/data_structure/layout/report_parts/layoutitem_header.h		\
+	glom/libglom/data_structure/layout/report_parts/layoutitem_summary.h		\
+	glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h
+
+libglom_document_headers =			\
+	glom/libglom/document/document.h	\
+	glom/libglom/document/view.h
+
+libglom_d_bakery_headers =				\
+	glom/libglom/document/bakery/document.h		\
+	glom/libglom/document/bakery/document_xml.h
+
+libglom_d_b_view_headers =					\
+	glom/libglom/document/bakery/view/view.h		\
+	glom/libglom/document/bakery/view/view_composite.h	\
+	glom/libglom/document/bakery/view/viewbase.h
+
+libglom_headers =				\
+	$(libglom_toplevel_headers)		\
+	$(libglom_data_structure_headers)	\
+	$(libglom_ds_layout_headers)		\
+	$(libglom_ds_l_report_parts_headers)	\
+	$(libglom_document_headers)		\
+	$(libglom_d_bakery_headers)		\
+	$(libglom_d_b_view_headers)
+
+# Private source and header files:
+
+libglom_sources =							\
+	glom/libglom/appstate.cc					\
+	glom/libglom/calcinprogress.cc					\
+	glom/libglom/calcinprogress.h					\
+	glom/libglom/connectionpool.cc					\
+	glom/libglom/connectionpool.h					\
+	glom/libglom/db_utils.cc					\
+	glom/libglom/db_utils.h						\
+	glom/libglom/glom_postgres.cc					\
+	glom/libglom/glom_postgres.h					\
+	glom/libglom/gst-package.c					\
+	glom/libglom/gst-package.h					\
+	glom/libglom/init.cc						\
+	glom/libglom/privs.cc						\
+	glom/libglom/privs.h						\
+	glom/libglom/spawn_with_feedback.cc				\
+	glom/libglom/spawn_with_feedback.h				\
+	glom/libglom/utils.cc						\
+	glom/libglom/utils.h						\
+	glom/libglom/connectionpool_backends/backend.cc			\
+	glom/libglom/connectionpool_backends/backend.h			\
+	glom/libglom/data_structure/field.cc				\
+	glom/libglom/data_structure/fieldtypes.cc			\
+	glom/libglom/data_structure/foundset.cc				\
+	glom/libglom/data_structure/glomconversions.cc			\
+	glom/libglom/data_structure/groupinfo.cc			\
+	glom/libglom/data_structure/has_title_singular.cc		\
+	glom/libglom/data_structure/numeric_format.cc			\
+	glom/libglom/data_structure/parameternamegenerator.cc		\
+	glom/libglom/data_structure/print_layout.cc			\
+	glom/libglom/data_structure/privileges.cc			\
+	glom/libglom/data_structure/relationship.cc			\
+	glom/libglom/data_structure/report.cc				\
+	glom/libglom/data_structure/system_prefs.cc			\
+	glom/libglom/data_structure/tableinfo.cc			\
+	glom/libglom/data_structure/translatable_item.cc		\
+	glom/libglom/data_structure/layout/custom_title.cc		\
+	glom/libglom/data_structure/layout/fieldformatting.cc		\
+	glom/libglom/data_structure/layout/layoutgroup.cc		\
+	glom/libglom/data_structure/layout/layoutitem.cc		\
+	glom/libglom/data_structure/layout/layoutitem_button.cc		\
+	glom/libglom/data_structure/layout/layoutitem_calendarportal.cc	\
+	glom/libglom/data_structure/layout/layoutitem_field.cc		\
+	glom/libglom/data_structure/layout/layoutitem_image.cc		\
+	glom/libglom/data_structure/layout/layoutitem_line.cc		\
+	glom/libglom/data_structure/layout/layoutitem_notebook.cc	\
+	glom/libglom/data_structure/layout/layoutitem_placeholder.cc	\
+	glom/libglom/data_structure/layout/layoutitem_portal.cc		\
+	glom/libglom/data_structure/layout/layoutitem_text.cc		\
+	glom/libglom/data_structure/layout/layoutitem_withformatting.cc	\
+	glom/libglom/data_structure/layout/usesrelationship.cc		\
+	glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc	\
+	glom/libglom/data_structure/layout/report_parts/layoutitem_footer.cc		\
+	glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.cc		\
+	glom/libglom/data_structure/layout/report_parts/layoutitem_header.cc		\
+	glom/libglom/data_structure/layout/report_parts/layoutitem_summary.cc		\
+	glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.cc	\
+	glom/libglom/document/document.cc				\
+	glom/libglom/document/bakery/document.cc			\
+	glom/libglom/document/bakery/document_xml.cc			\
+	glom/libglom/document/bakery/view/view.cc			\
+	glom/libglom/document/bakery/view/view_composite.cc		\
+	glom/libglom/document/bakery/view/viewbase.cc			\
+	glom/libglom/python_embed/py_glom_record.cc			\
+	glom/libglom/python_embed/py_glom_record.h			\
+	glom/libglom/python_embed/py_glom_related.cc			\
+	glom/libglom/python_embed/py_glom_related.h			\
+	glom/libglom/python_embed/py_glom_relatedrecord.cc		\
+	glom/libglom/python_embed/py_glom_relatedrecord.h		\
+	glom/libglom/python_embed/py_glom_ui.cc				\
+	glom/libglom/python_embed/py_glom_ui.h				\
+	glom/libglom/python_embed/py_glom_ui_callbacks.h		\
+	glom/libglom/python_embed/pygdavalue_conversions.cc		\
+	glom/libglom/python_embed/pygdavalue_conversions.h		\
+	glom/libglom/connectionpool_backends/sqlite.cc			\
+	glom/libglom/connectionpool_backends/sqlite.h			\
+	glom/libglom/connectionpool_backends/postgres.cc		\
+	glom/libglom/connectionpool_backends/postgres.h			\
+	glom/libglom/connectionpool_backends/postgres_central.cc	\
+	glom/libglom/connectionpool_backends/postgres_central.h
+
+if !GLOM_ENABLE_CLIENT_ONLY
+libglom_sources +=						\
+	glom/libglom/connectionpool_backends/postgres_self.cc	\
+	glom/libglom/connectionpool_backends/postgres_self.h
+endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]