Commit e68b6388 authored by Arturo Espinosa's avatar Arturo Espinosa

Integrate libglade into gnumeric compilation process.



Integrate libglade into gnumeric compilation process.

Add wizard for graphics creation (using beautiful Glade/libglade combo
to cook up the dialog box in 30 minutes).

Miguel.
parent caddee7c
SUBDIRS = intl po macros plugins src doc SUBDIRS = intl po macros libglade plugins src doc
EXTRA_DIST = \ EXTRA_DIST = \
gnumeric.desktop README HACKING gnumeric.spec.in \ gnumeric.desktop README HACKING gnumeric.spec.in \
......
...@@ -11,3 +11,14 @@ ...@@ -11,3 +11,14 @@
#undef HAVE_GUILE #undef HAVE_GUILE
#undef ENABLE_BONOBO #undef ENABLE_BONOBO
#undef HAVE_IEEEFP_H #undef HAVE_IEEEFP_H
#undef ENABLE_GNOME
@BOTTOM@
/* This is from libglade */
#ifdef DEBUG
# define debug(stmnt) stmnt
#else
# define debug(stmnt) /* nothing */
#endif
...@@ -6,6 +6,13 @@ test -z "$srcdir" && srcdir=. ...@@ -6,6 +6,13 @@ test -z "$srcdir" && srcdir=.
PKG_NAME="Gnumeric" PKG_NAME="Gnumeric"
if test -d libglade; then
> libglade/NO-AUTO-GEN
else
echo you need to checkout gnumeric again
exit 1
fi
(test -f $srcdir/configure.in \ (test -f $srcdir/configure.in \
&& test -d $srcdir/src \ && test -d $srcdir/src \
&& test -f $srcdir/src/gnumeric.h) || { && test -f $srcdir/src/gnumeric.h) || {
......
...@@ -129,11 +129,32 @@ AM_PATH_BONOBO(0.1.0, [ ...@@ -129,11 +129,32 @@ AM_PATH_BONOBO(0.1.0, [
]) ])
AM_CONDITIONAL(BONOBO, $have_bonobo) AM_CONDITIONAL(BONOBO, $have_bonobo)
dnl ******************************************
dnl LibGlade tests:
dnl These duplicate the things
dnl that are in libglade's configure.in
dnl so that we can include it in gnumeric.
dnl ******************************************
AC_PROG_AWK
GDK_KEYSYMS="`$GTK_CONFIG --prefix`/include/gdk/gdkkeysyms.h"
AC_SUBST(GDK_KEYSYMS)
AC_DEFINE(ENABLE_GNOME)
AM_CONDITIONAL(GNOME_SUPPORT, true)
AM_CONDITIONAL(LIBGLADE_FULLDIST, false)
XML_LIBS=`gnome-config --libs xml`
XML_CFLAGS=`gnome-config --cflags xml`/gnome-xml
AC_SUBST(XML_LIBS)
AC_SUBST(XML_CFLAGS)
AC_OUTPUT([ AC_OUTPUT([
gnumeric.spec gnumeric.spec
Makefile Makefile
src/Makefile src/Makefile
wizards/graphics wizards/Makefile
wizards/graphics/Makefile
libglade/Makefile
libglade/glade/Makefile
doc/Makefile doc/Makefile
doc/C/Makefile doc/C/Makefile
doc/es/Makefile doc/es/Makefile
......
Makefile
Makefile.in
SUBDIRS = graphics
\ No newline at end of file
Makefile
Makefile.in
*~
#
# Gnumeric's Graphics Wizard Makefile
#
# Author: Miguel de Icaza (miguel@kernel.org)
#
noinst_PROGRAMS = graphics-wizard
graphics_wizard_SOURCES = \
chooser.c
main.c
graphics_wizard_LDADD = \
$(GNOME_LIBDIR) \
$(GNOMEUI_LIBS) \
$(BONOBO_LIBS) \
$(INTLLIBS)
This diff is collapsed.
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