diff --git a/ChangeLog b/ChangeLog index 469ccdba2..b8ec35c82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-04-30 Mike Kestner + + * configure.in : remove BASE_DEPENDENCIES LIBS and CFLAGS and + expose more specific versions for glue building. + * */glue/Makefile.am : use more specific versions of LIBS and CFLAGS + to reduce the ldd footprint. + 2004-04-30 Mike Kestner * configure.in : AC_SUBST an API_VERSION=1.0.0.0 for the diff --git a/configure.in b/configure.in index 729b5daea..3097aa2a3 100644 --- a/configure.in +++ b/configure.in @@ -112,6 +112,10 @@ PKG_CHECK_MODULES(GLIB, glib-2.0) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) +PKG_CHECK_MODULES(GTK, gtk+-2.0) +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_LIBS) + PKG_CHECK_MODULES(XML, libxml-2.0) AC_SUBST(XML_CFLAGS) AC_SUBST(XML_LIBS) @@ -124,56 +128,30 @@ PKG_CHECK_MODULES(LIBART, libart-2.0 >= $GNOME_REQUIRED_VERSION, enable_libart=y AC_SUBST(LIBART_CFLAGS) AC_SUBST(LIBART_LIBS) -PKG_CHECK_MODULES(BASE_DEPENDENCIES, libgnomecanvas-2.0 >= $GNOME_REQUIRED_VERSION libgnomeui-2.0 >= $GNOME_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION libgnomeprintui-2.2 >= $GNOME_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no) - -if test "x$enable_gnome" = "xno"; then - PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk+-2.0 >= $GTK_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION) -fi +PKG_CHECK_MODULES(GNOME, libgnomecanvas-2.0 >= $GNOME_REQUIRED_VERSION libgnomeui-2.0 >= $GNOME_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION libgnomeprintui-2.2 >= $GNOME_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no) +AC_SUBST(GNOME_CFLAGS) +AC_SUBST(GNOME_LIBS) GLADE_REQUIRED_VERSION=2.0.0 -PKG_CHECK_MODULES(GLADE_DEPENDENCIES, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=yes, enable_glade=no) -if test "x$enable_glade" = "xyes"; then - BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS $GLADE_DEPENDENCIES_CFLAGS" - BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $GLADE_DEPENDENCIES_LIBS" -fi +PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=yes, enable_glade=no) +AC_SUBST(GLADE_CFLAGS) +AC_SUBST(GLADE_LIBS) LIBGDA_REQUIRED_VERSION=1.0.0 PKG_CHECK_MODULES(LIBGDA_DEPENDENCIES, libgda >= $LIBGDA_REQUIRED_VERSION, enable_gda=yes, enable_gda=no) enable_gnomedb=no if test "x$enable_gda" = "xyes"; then - BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS $LIBGDA_DEPENDENCIES_CFLAGS" - BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $LIBGDA_DEPENDENCIES_LIBS" - PKG_CHECK_MODULES(LIBGNOMEDB_DEPENDENCIES, libgnomedb >= $LIBGDA_REQUIRED_VERSION, enable_gnomedb=yes, enable_gnomedb=no) - if test "x$enable_gnomedb" = "xyes"; then - BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS $LIBGNOMEDB_DEPENDENCIES_CFLAGS" - BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $LIBGNOMEDB_DEPENDENCIES_LIBS" - fi fi RSVG_REQUIRED_VERSION=2.0.1 PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enable_rsvg=yes, enable_rsvg=no) -if test "x$enable_rsvg" = "xyes"; then - BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS $RSVG_DEPENDENCIES_CFLAGS" - BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $RSVG_DEPENDENCIES_LIBS" -fi GTKHTML_REQUIRED_VERSION=3.0 PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.0 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no) -if test "x$enable_gtkhtml" = "xyes"; then - BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS $GTKHTML_DEPENDENCIES_CFLAGS" - BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $GTKHTML_DEPENDENCIES_LIBS" -fi VTE_REQUIRED_VERSION=0.11.10 PKG_CHECK_MODULES(VTE_DEPENDENCIES, vte >= $VTE_REQUIRED_VERSION, enable_vte=yes, enable_vte=no) -if test "x$enable_vte" = "xyes"; then - BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS $VTE_DEPENDENCIES_CFLAGS" - BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $VTE_DEPENDENCIES_LIBS" -fi - -AC_SUBST(BASE_DEPENDENCIES_CFLAGS) -AC_SUBST(BASE_DEPENDENCIES_LIBS) AM_CONDITIONAL(ENABLE_LIBART, test "x$enable_libart" = "xyes") AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes") diff --git a/gdk/glue/Makefile.am b/gdk/glue/Makefile.am index 92a05d63c..4f491ff40 100644 --- a/gdk/glue/Makefile.am +++ b/gdk/glue/Makefile.am @@ -12,9 +12,9 @@ libgdksharpglue_la_SOURCES = \ libgdksharpglue_la_LDFLAGS = -module -avoid-version -libgdksharpglue_la_LIBADD = $(BASE_DEPENDENCIES_LIBS) +libgdksharpglue_la_LIBADD = $(GTK_LIBS) -INCLUDES = $(BASE_DEPENDENCIES_CFLAGS) -I$(top_srcdir) +INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir) libgdksharpglue.dll: $(libgdksharpglue_la_OBJECTS) libgdksharpglue.rc libgdksharpglue.def ./build-dll libgdksharpglue $(VERSION) diff --git a/glade/glue/Makefile.am b/glade/glue/Makefile.am index fef65f1a4..87a235f70 100644 --- a/glade/glue/Makefile.am +++ b/glade/glue/Makefile.am @@ -11,9 +11,9 @@ libgladesharpglue_la_LDFLAGS = -module -avoid-version libgladesharpglue_la_SOURCES = \ gladexml.c -libgladesharpglue_la_LIBADD = $(BASE_DEPENDENCIES_LIBS) +libgladesharpglue_la_LIBADD = $(GLADE_LIBS) -INCLUDES = $(BASE_DEPENDENCIES_CFLAGS) -I$(top_srcdir) +INCLUDES = $(GLADE_CFLAGS) -I$(top_srcdir) libgladesharpglue.dll: $(libgladesharpglue_la_OBJECTS) libgladesharpglue.rc libgladesharpglue.def ./build-dll libgladesharpglue $(VERSION) diff --git a/glib/glue/Makefile.am b/glib/glue/Makefile.am index aecd1a055..ee7966363 100644 --- a/glib/glue/Makefile.am +++ b/glib/glue/Makefile.am @@ -16,9 +16,9 @@ libglibsharpglue_la_SOURCES = \ # Adding a new glue file? # Please remember to update makefile.win32 -libglibsharpglue_la_LIBADD = $(BASE_DEPENDENCIES_LIBS) +libglibsharpglue_la_LIBADD = $(GLIB_LIBS) -INCLUDES = $(BASE_DEPENDENCIES_CFLAGS) -I$(top_srcdir) +INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) libgtksharpglue.dll: $(libgtksharpglue_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def ./build-dll libgtksharpglue $(VERSION) diff --git a/gnome/glue/Makefile.am b/gnome/glue/Makefile.am index 928024816..c019563e7 100644 --- a/gnome/glue/Makefile.am +++ b/gnome/glue/Makefile.am @@ -18,9 +18,9 @@ libgnomesharpglue_la_SOURCES = \ program.c \ # -libgnomesharpglue_la_LIBADD = $(BASE_DEPENDENCIES_LIBS) +libgnomesharpglue_la_LIBADD = $(GNOME_LIBS) -INCLUDES = $(BASE_DEPENDENCIES_CFLAGS) -I$(top_srcdir) +INCLUDES = $(GNOME_CFLAGS) -I$(top_srcdir) libgnomesharpglue.dll: $(libgnomesharpglue_la_OBJECTS) libgnomesharpglue.rc libgnomesharpglue.def ./build-dll libgnomesharpglue $(VERSION) diff --git a/gtk/glue/Makefile.am b/gtk/glue/Makefile.am index 5f5c0642a..25cd111c9 100644 --- a/gtk/glue/Makefile.am +++ b/gtk/glue/Makefile.am @@ -22,9 +22,9 @@ libgtksharpglue_la_SOURCES = \ libgtksharpglue_la_LDFLAGS = -module -avoid-version -libgtksharpglue_la_LIBADD = $(BASE_DEPENDENCIES_LIBS) +libgtksharpglue_la_LIBADD = $(GTK_LIBS) -INCLUDES = $(BASE_DEPENDENCIES_CFLAGS) -I$(top_srcdir) +INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir) libgtksharpglue.dll: $(libgtksharpglue_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def ./build-dll libgtksharpglue $(VERSION)