Commit d3fedd07 authored by Murray Cumming's avatar Murray Cumming Committed by Murray Cumming
Browse files

Include all libglom headers via libglom/ instead of glom/libglom so it

2009-03-03  Murray Cumming  <murrayc@murrayc.com>

* *.[h|cc]: Include all libglom headers via libglom/ instead of 
glom/libglom so it works from outside, with the path to the installed 
headers, from pkg-config.
* All Makefile.am files: Add -I@top_srcdir@/glom to AM_CPPFLAGS.
The repetition is awful. We should avoid that somehow.

svn path=/trunk/; revision=1950
parent b2159082
2009-03-03 Murray Cumming <murrayc@murrayc.com>
* *.[h|cc]: Include all libglom headers via libglom/ instead of
glom/libglom so it works from outside, with the path to the installed
headers, from pkg-config.
* All Makefile.am files: Add -I@top_srcdir@/glom to AM_CPPFLAGS.
The repetition is awful. We should avoid that somehow.
2009-03-03 Murray Cumming <murrayc@murrayc.com>
 
* configure.in:
......
......@@ -15,7 +15,7 @@ noinst_PROGRAMS = test_pyembed
# We define GLOM_GLADEDIR so that we can get the installed .glade file at runtime.
# We define PREFIX, SYSCONFDIR, LIBDIR, and DATADIR for the GNOME_PROGRAM_STANDARD_PROPERTIES macro.
AM_CPPFLAGS = -I@top_srcdir@/ $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
AM_CPPFLAGS = -I@top_srcdir@/ -I@top_srcdir@/glom $(GLOM_CFLAGS) $(PYTHON_INCLUDES) \
$(MAEMO_LAUNCHER_CFLAGS) \
-DGLOM_GLADEDIR=\""$(gladedir)/"\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
......
......@@ -23,7 +23,7 @@
#include "application.h"
#include "dialog_existing_or_new.h"
#include <glom/libglom/dialog_progress_creating.h>
#include <libglom/dialog_progress_creating.h>
#ifndef GLOM_ENABLE_CLIENT_ONLY
#include <glom/translation/dialog_change_language.h>
......@@ -31,11 +31,11 @@
#include <glom/utility_widgets/filechooserdialog_saveextras.h>
#endif // !GLOM_ENABLE_CLIENT_ONLY
#include <glom/libglom/utils.h>
#include <glom/libglom/glade_utils.h>
#include <libglom/utils.h>
#include <libglom/glade_utils.h>
//#include <glom/libglom/connectionpool_backends/postgres_central.h>
//#include <glom/libglom/connectionpool_backends/postgres_self.h>
//#include <libglom/connectionpool_backends/postgres_central.h>
//#include <libglom/connectionpool_backends/postgres_self.h>
#include <cstdio>
#include <memory> //For std::auto_ptr<>
......
......@@ -22,10 +22,10 @@
#include "base_db.h"
#include "application.h" //App_Glom.
#include <glom/libglom/appstate.h>
#include <glom/libglom/standard_table_prefs_fields.h>
#include <glom/libglom/document/document_glom.h>
#include <glom/libglom/data_structure/glomconversions.h>
#include <libglom/appstate.h>
#include <libglom/standard_table_prefs_fields.h>
#include <libglom/document/document_glom.h>
#include <libglom/data_structure/glomconversions.h>
#include "mode_data/dialog_choose_field.h"
//#ifndef GLOM_ENABLE_CLIENT_ONLY
......@@ -36,15 +36,15 @@
//#endif // !GLOM_ENABLE_CLIENT_ONLY
//#include "reports/dialog_layout_report.h"
#include <glom/libglom/utils.h>
#include <glom/libglom/glade_utils.h>
#include <glom/libglom/data_structure/glomconversions.h>
#include <glom/libglom/data_structure/parameternamegenerator.h>
#include <glom/libglom/data_structure/layout/report_parts/layoutitem_summary.h>
#include <glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
#include <glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h>
#include <glom/libglom/data_structure/layout/report_parts/layoutitem_header.h>
#include <glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h>
#include <libglom/utils.h>
#include <libglom/glade_utils.h>
#include <libglom/data_structure/glomconversions.h>
#include <libglom/data_structure/parameternamegenerator.h>
#include <libglom/data_structure/layout/report_parts/layoutitem_summary.h>
#include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
#include <libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h>
#include <libglom/data_structure/layout/report_parts/layoutitem_header.h>
#include <libglom/data_structure/layout/report_parts/layoutitem_footer.h>
#include "python_embed/glom_python.h"
#include <glom/glom_postgres.h>
#include <glom/glom_privs.h>
......
......@@ -25,14 +25,14 @@
#include <gtkmm.h>
#include <glom/libglom/document/view.h>
#include <glom/libglom/connectionpool.h>
#include <glom/libglom/appstate.h>
#include <glom/libglom/data_structure/foundset.h>
#include <glom/libglom/data_structure/privileges.h>
#include <glom/libglom/data_structure/system_prefs.h>
#include <glom/libglom/utils.h>
#include <glom/libglom/calcinprogress.h>
#include <libglom/document/view.h>
#include <libglom/connectionpool.h>
#include <libglom/appstate.h>
#include <libglom/data_structure/foundset.h>
#include <libglom/data_structure/privileges.h>
#include <libglom/data_structure/system_prefs.h>
#include <libglom/utils.h>
#include <libglom/calcinprogress.h>
#include "bakery/View/View.h"
#include <bakery/Utilities/BusyCursor.h>
......
......@@ -19,7 +19,7 @@
*/
#include "base_db_table.h"
#include <glom/libglom/data_structure/glomconversions.h>
#include <libglom/data_structure/glomconversions.h>
#include <glom/application.h>
#include "python_embed/glom_python.h"
#include <sstream>
......
......@@ -23,7 +23,7 @@
#define BASE_DB_TABLE_H
#include "base_db.h"
#include <glom/libglom/data_structure/field.h>
#include <libglom/data_structure/field.h>
#include <algorithm> //find_if used in various places.
namespace Glom
......
......@@ -19,7 +19,7 @@
*/
#include "base_db_table_data.h"
#include <glom/libglom/data_structure/glomconversions.h>
#include <libglom/data_structure/glomconversions.h>
#include <glom/application.h>
#include "python_embed/glom_python.h"
#include <sstream>
......
......@@ -23,7 +23,7 @@
#define BASE_DB_TABLE_DATA_H
#include "base_db_table.h"
#include <glom/libglom/data_structure/field.h>
#include <libglom/data_structure/field.h>
#include <algorithm> //find_if used in various places.
namespace Glom
......
......@@ -19,7 +19,7 @@
*/
#include "box_db_table.h"
#include <glom/libglom/data_structure/glomconversions.h>
#include <libglom/data_structure/glomconversions.h>
#include "python_embed/glom_python.h"
#include <sstream>
......
......@@ -24,7 +24,7 @@
#include <glom/box_withbuttons.h>
#include <glom/base_db_table.h>
#include <glom/libglom/data_structure/field.h>
#include <libglom/data_structure/field.h>
#include <libglademm.h>
#include <algorithm> //find_if used in various places.
......
......@@ -22,7 +22,7 @@
#define BOX_REPORTS_H
#include "box_db_table.h"
#include <glom/libglom/data_structure/report.h>
#include <libglom/data_structure/report.h>
namespace Glom
{
......
......@@ -20,7 +20,7 @@
#include "box_withbuttons.h"
#include "application.h" //App_Glom.
#include <glom/libglom/appstate.h>
#include <libglom/appstate.h>
//#include <libgnomeui/gnome-app-helper.h>
#include <sstream> //For stringstream
......
......@@ -24,9 +24,9 @@
#include <gtkmm.h>
#include "utility_widgets/adddel/adddel_withbuttons.h"
#include <glom/libglom/document/document_glom.h>
#include <glom/libglom/connectionpool.h>
#include <glom/libglom/appstate.h>
#include <libglom/document/document_glom.h>
#include <libglom/connectionpool.h>
#include <libglom/appstate.h>
#include "base_db.h"
#include <bakery/Utilities/BusyCursor.h>
#include <libglademm.h>
......
......@@ -23,9 +23,9 @@
#include <gtkmm/combobox.h>
#include <libglademm.h>
#include <glom/libglom/data_structure/field.h>
#include <glom/libglom/document/document_glom.h>
#include <glom/libglom/sharedptr.h>
#include <libglom/data_structure/field.h>
#include <libglom/document/document_glom.h>
#include <libglom/sharedptr.h>
#include <gtkmm/treestore.h>
......
......@@ -23,9 +23,9 @@
#include <gtkmm/combobox.h>
#include <libglademm.h>
#include <glom/libglom/data_structure/relationship.h>
#include <glom/libglom/document/document_glom.h>
#include <glom/libglom/sharedptr.h>
#include <libglom/data_structure/relationship.h>
#include <libglom/document/document_glom.h>
#include <libglom/sharedptr.h>
#include <gtkmm/treestore.h>
......
......@@ -22,11 +22,11 @@
#include "box_withbuttons.h" //For Box_WithButtons::connect_to_server().
#include <glibmm/i18n.h>
#include <glom/libglom/connectionpool.h>
#include <libglom/connectionpool.h>
#ifdef GLOM_ENABLE_POSTGRESQL
#include <glom/libglom/connectionpool_backends/postgres_central.h>
#include <glom/libglom/connectionpool_backends/postgres_self.h>
#include <libglom/connectionpool_backends/postgres_central.h>
#include <libglom/connectionpool_backends/postgres_self.h>
#endif //#ifdef GLOM_ENABLE_POSTGRESQL
namespace Glom
......
......@@ -26,7 +26,7 @@
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
#include "base_db.h"
#include <glom/libglom/connectionpool.h>
#include <libglom/connectionpool.h>
namespace Glom
{
......
......@@ -20,8 +20,8 @@
#include "dialog_database_preferences.h"
#include "box_withbuttons.h" //For Box_WithButtons::connect_to_server().
#include <glom/libglom/standard_table_prefs_fields.h>
#include <glom/libglom/data_structure/glomconversions.h>
#include <libglom/standard_table_prefs_fields.h>
#include <libglom/data_structure/glomconversions.h>
#include <bakery/Utilities/BusyCursor.h>
#include <glibmm/i18n.h>
......
......@@ -27,8 +27,8 @@
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
#include "base_db.h"
#include <glom/libglom/data_structure/system_prefs.h>
#include <glom/libglom/connectionpool.h>
#include <libglom/data_structure/system_prefs.h>
#include <libglom/connectionpool.h>
#include "utility_widgets/imageglom.h"
namespace Glom
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment