diff --git a/ChangeLog b/ChangeLog index 73b4c83c3..91b87c900 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2002-09-08 Rodrigo Moya + + * makefile: + * configure.in: + * sources/gtk-sharp.sources: added needed stuff for libgnomedb. + + * gnomedb/Makefile.in: + * api/Makefile.in: + * api/gnomedb-api.xml: new files for libgnomedb API. + 2002-09-07 Rachel Hestilow * parser/gapi2xml.pl: Add support for "fake struct" opaque types. diff --git a/api/Makefile.in b/api/Makefile.in index f833e90fc..01bf95755 100644 --- a/api/Makefile.in +++ b/api/Makefile.in @@ -8,7 +8,8 @@ APIS = \ glade-api.xml \ art-api.xml \ gnome-api.xml \ - gda-api.xml + gda-api.xml \ + gnomedb-api.xml RUNTIME=mono diff --git a/api/gnomedb-api.xml b/api/gnomedb-api.xml new file mode 100644 index 000000000..45d5dac21 --- /dev/null +++ b/api/gnomedb-api.xml @@ -0,0 +1,603 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configure.in b/configure.in index 1a73edf81..06d0c5e69 100644 --- a/configure.in +++ b/configure.in @@ -79,6 +79,12 @@ PKG_CHECK_MODULES(LIBGDA_DEPENDENCIES, libgda >= $LIBGDA_REQUIRED_VERSION, enabl 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 AC_SUBST(BASE_DEPENDENCIES_CFLAGS) @@ -87,6 +93,7 @@ AC_SUBST(BASE_DEPENDENCIES_LIBS) 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") AC_SUBST(CFLAGS) @@ -104,6 +111,7 @@ gtk/Makefile glade/Makefile gnome/Makefile gda/Makefile +gnomedb/Makefile sample/Makefile ]) diff --git a/gnomedb/.cvsignore b/gnomedb/.cvsignore new file mode 100755 index 000000000..05b7ea4f7 --- /dev/null +++ b/gnomedb/.cvsignore @@ -0,0 +1,6 @@ +*.dll +*.exe +*.xml +generated +Makefile + diff --git a/gnomedb/Makefile.in b/gnomedb/Makefile.in new file mode 100755 index 000000000..d6eb54cc4 --- /dev/null +++ b/gnomedb/Makefile.in @@ -0,0 +1,20 @@ +MCS=mcs +DESTDIR= + +@ENABLE_GNOMEDB_TRUE@ all: linux +@ENABLE_GNOMEDB_FALSE@ all: + +windows: + $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../gtk/gtk-sharp.dll /r:../gnome/gnome-sharp.dll /r:../gda/gda-sharp.dll /out:gnomedb-sharp.dll /recurse:*.cs + +linux: gnomedb-sharp.dll + +gnomedb-sharp.dll: generated/*.cs + $(MCS) --unsafe --target library -L ../glib -r glib-sharp.dll -r gtk-sharp.dll -r gnome-sharp.dll -r gda-sharp.dll -o gnomedb-sharp.dll --recurse '*.cs' + +clean: + rm -f *.dll + rm -rf generated + +install: all +@ENABLE_GNOMEDB_TRUE@ cp gnomedb-sharp.dll $(DESTDIR)@prefix@/lib diff --git a/makefile b/makefile index d4f29836e..8ab24e29d 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 sample +DIRS=generator api glib pango atk gdk gtk glade art gnome gda gnomedb 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 25bd55e7f..152336acb 100644 --- a/sources/gtk-sharp.sources +++ b/sources/gtk-sharp.sources @@ -10,3 +10,4 @@ gtkhtml/src Gtk gtkhtml-3.0 libglade-2.0.0/glade Glade glade-2.0 libart_lgpl-2.3.10 Art art_lgpl libgda-0.8.193/libgda Gda gda-2 +libgnomedb-0.8.193/libgnomedb GnomeDb gnomedb-2