From 4d30832fa7f242cf12be6f1c58bff8ac92459702 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 9 Jan 2003 22:54:37 +0000 Subject: [PATCH] 2003-01-09 Rodrigo Moya * makefile: * configure.in: * api/Makefile.in: * api/gphoto-api.xml: * sources/gtk-sharp.sources: * gphoto/Makefile.in: * gphoto/.cvsignore: removed gphoto2 bindings, to be moved to mphoto. svn path=/trunk/gtk-sharp/; revision=10314 --- ChangeLog | 10 ++ api/Makefile.in | 3 +- api/gphoto-api.xml | 255 -------------------------------------- configure.in | 9 -- makefile | 2 +- sources/gtk-sharp.sources | 1 - 6 files changed, 12 insertions(+), 268 deletions(-) delete mode 100644 api/gphoto-api.xml diff --git a/ChangeLog b/ChangeLog index d0cc1b516..8aab86fdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2003-01-09 Rodrigo Moya + + * makefile: + * configure.in: + * api/Makefile.in: + * api/gphoto-api.xml: + * sources/gtk-sharp.sources: + * gphoto/Makefile.in: + * gphoto/.cvsignore: removed gphoto2 bindings, to be moved to mphoto. + 2003-01-06 Pedro Abelleira Seco * pango/Layout.custom: Add Size get property and add some nicer overloads diff --git a/api/Makefile.in b/api/Makefile.in index 87c47e668..33286e4b9 100644 --- a/api/Makefile.in +++ b/api/Makefile.in @@ -10,8 +10,7 @@ APIS = \ gnome-api.xml \ gda-api.xml \ gst-api.xml \ - gnomedb-api.xml \ - gphoto-api.xml + gnomedb-api.xml RUNTIME=mono diff --git a/api/gphoto-api.xml b/api/gphoto-api.xml deleted file mode 100644 index f24bbbf30..000000000 --- a/api/gphoto-api.xml +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configure.in b/configure.in index b927e19f1..8e34dc700 100644 --- a/configure.in +++ b/configure.in @@ -88,13 +88,6 @@ if test "x$enable_gda" = "xyes"; then fi fi -LIBGPHOTO2_REQUIRED_VERSION=2.1.1 -PKG_CHECK_MODULES(LIBGPHOTO2_DEPENDENCIES, libgphoto2 >= $LIBGPHOTO2_REQUIRED_VERSION, enable_gphoto2=yes, enable_gphoto2=no) -if test "x$enable_gphoto2" = "xyes"; then - BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS $LIBGPHOTO2_DEPENDENCIES_CFLAGS" - BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $LIBGPHOTO2_DEPENDENCIES_LIBS" -fi - AC_SUBST(BASE_DEPENDENCIES_CFLAGS) AC_SUBST(BASE_DEPENDENCIES_LIBS) @@ -102,7 +95,6 @@ AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes") AM_CONDITIONAL(ENABLE_GLADE, test "x$enable_glade" = "xyes") AM_CONDITIONAL(ENABLE_GDA, test "x$enable_gda" = "xyes") AM_CONDITIONAL(ENABLE_GNOMEDB, test "x$enable_gnomedb" = "xyes") -AM_CONDITIONAL(ENABLE_GPHOTO2, test "x$enable_gphoto2" = "xyes") AC_SUBST(CFLAGS) @@ -126,7 +118,6 @@ gconf/GConf/Makefile gconf/GConf.PropertyEditors/Makefile gconf/tools/Makefile gst/Makefile -gphoto/Makefile sample/Makefile ]) diff --git a/makefile b/makefile index bc4c41ca5..df3f304c4 100644 --- a/makefile +++ b/makefile @@ -1,6 +1,6 @@ NATIVE_DIRS = glue parser -DIRS=generator api glib pango atk gdk gtk glade art gnome gda gnomedb gconf gphoto sample +DIRS=generator api glib pango atk gdk gtk glade art gnome gda gnomedb gconf sample ROOT=/cygdrive/$(subst \,/,$(subst :\,/,$(SYSTEMROOT))) CSC=$(ROOT)/microsoft.net/framework/v1.0.3705/csc.exe MCS=mcs diff --git a/sources/gtk-sharp.sources b/sources/gtk-sharp.sources index 535d83e85..a7cf94269 100644 --- a/sources/gtk-sharp.sources +++ b/sources/gtk-sharp.sources @@ -12,4 +12,3 @@ libart_lgpl-2.3.10 Art art_lgpl libgda-0.8.193/libgda Gda gda-2 libgnomedb-0.8.193/libgnomedb GnomeDb gnomedb-2 gstreamer-0.4.2/gst Gst gstreamer -libgphoto2-2.1.2dev1/libgphoto2 Gphoto libgphoto2