glom r1440 - in trunk: . glom glom/utility_widgets

[jhs svn gnome org]

Author: jhs
Date: Mon Feb 25 11:37:41 2008
New Revision: 1440
URL: http://svn.gnome.org/viewvc/glom?rev=1440&view=rev

Log:
2008-02-25  Johannes Schmid <johannes schmid openismus com>

	* configure.in:
	* glom/Makefile.am:
	* glom/utility_widgets/Makefile.am:
	* glom/utility_widgets/eggtoolpalette/* (external)
	* glom/utility_widgets/util/* (external)
	
	Integrated eggtoolpalette into the build system (not used yet)

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/glom/Makefile.am
   trunk/glom/utility_widgets/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Feb 25 11:37:41 2008
@@ -108,6 +108,11 @@
 AC_SUBST(GLOM_CFLAGS)
 AC_SUBST(GLOM_LIBS)
 
+# Temporary egg CFLAGS
+PKG_CHECK_MODULES(EGG, gtk+-2.0 >= 2.5.0)
+GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`  
+AC_SUBST(GLIB_GENMARSHAL)
+
 #Get the location of the ISO-Codes (currencies, languages) files:
 AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
 
@@ -215,6 +220,8 @@
         glom/utility_widgets/adddel/eggcolumnchooser/Makefile \
       glom/utility_widgets/canvas/Makefile \
       glom/utility_widgets/db_adddel/Makefile \
+      glom/utility_widgets/eggtoolpalette/Makefile \
+      glom/utility_widgets/util/Makefile \
       glom/python_embed/Makefile \
         glom/python_embed/python_module/Makefile \
     glom/relationships_overview/Makefile \

Modified: trunk/glom/Makefile.am
==============================================================================
--- trunk/glom/Makefile.am	(original)
+++ trunk/glom/Makefile.am	Mon Feb 25 11:37:41 2008
@@ -75,7 +75,9 @@
               utility_widgets/adddel/eggcolumnchooser/libutility_widgets_adddel_eggcolumnchooserdialog.a \
               utility_widgets/db_adddel/libutility_widgets_db_adddel.a \
               utility_widgets/canvas/libutility_widgets_canvas.a \
-              utility_widgets/cellrendererlist/libutility_widgets_cellrendererlist.a
+              utility_widgets/cellrendererlist/libutility_widgets_cellrendererlist.a \
+              utility_widgets/eggtoolpalette/libeggtoolpalette.la \
+              utility_widgets/util/libeggutil.la
 
 glom_LDADD += python_embed/libpython_embed.a \
               $(top_builddir)/glom/libglom/libglom.la \

Modified: trunk/glom/utility_widgets/Makefile.am
==============================================================================
--- trunk/glom/utility_widgets/Makefile.am	(original)
+++ trunk/glom/utility_widgets/Makefile.am	Mon Feb 25 11:37:41 2008
@@ -1,6 +1,6 @@
 #AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS)
 
-SUBDIRS = cellrendererlist adddel db_adddel canvas calendar
+SUBDIRS = cellrendererlist adddel db_adddel canvas calendar util eggtoolpalette 
 
 gladedir = $(datadir)/glom/glade/
 glom_icon_dir = $(datadir)/glom/pixmaps