[glom/glom-1-18] Do not install .glade files and icons if only building libglom.



commit 874d550dcd6a416d09326244b1efd8ce56b811cc
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jun 17 10:34:17 2011 +0200

    Do not install .glade files and icons if only building libglom.
    
    * Makefile.am: Put some lines in if GLOM_ENABLE_UI blocks.

 ChangeLog   |    6 ++++++
 Makefile.am |    6 +++++-
 2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3177da0..a08bcbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-17  Murray Cumming  <murrayc murrayc com>
+
+	Do not install .glade files and icons if only building libglom.
+
+	* Makefile.am: Put some lines in if GLOM_ENABLE_UI blocks.
+
 2011-04-12  Murray Cumming  <murrayc murrayc com>
 
 	Correct the sizing of the ... date button.
diff --git a/Makefile.am b/Makefile.am
index 68883de..edb4c59 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,11 +83,13 @@ pkgconfig_DATA = glom/libglom/glom- GLOM_ABI_VERSION@.pc
 
 dist_pkgdata_DATA = glom/glom_document.dtd
 
+if GLOM_ENABLE_UI
 gladedir = $(pkgdatadir)/glade
 dist_glade_DATA = glom/glom.glade glom/glom_developer.glade
 
 xsltdir = $(pkgdatadir)/xslt
 dist_xslt_DATA = xslt/print_details_to_html.xsl xslt/print_report_to_html.xsl
+endif
 
 exampledir = $(docdir)/examples
 dist_example_DATA =				\
@@ -98,8 +100,9 @@ dist_example_DATA =				\
 	examples/example_project_manager.glom	\
 	examples/example_smallbusiness.glom
 
-dist_noinst_DATA = examples/sqlite/test_sqlite_music/test_sqlite_music.glom
+dist_noinst_DATA += examples/sqlite/test_sqlite_music/test_sqlite_music.glom
 
+if GLOM_ENABLE_UI
 iconthemedir = $(datadir)/icons/hicolor
 appicon16dir = $(iconthemedir)/16x16/apps
 appicon22dir = $(iconthemedir)/22x22/apps
@@ -128,6 +131,7 @@ dist_pixmap_DATA =				\
 	icons/16x16/glom-notebook.png		\
 	icons/16x16/glom-related-records.png	\
 	icons/16x16/glom-text.png
+endif
 
 if GLOM_ENABLE_MAEMO
 desktopdir = $(OSSO_DESKTOPDIR)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]