From ebdbd5eb136f3ecabf1153f849f4d086066a7e6d Mon Sep 17 00:00:00 2001 From: Sergey Cherepanov Date: Mon, 3 Dec 2012 13:57:13 +1100 Subject: [PATCH] Add minimal infrastructure for GObject. --- configure.ac | 1 + lib/Makefile.am | 2 +- lib/gobject/Makefile.am | 20 ++++++++++++++++++++ lib/gobject/gobject.h | 33 +++++++++++++++++++++++++++++++++ lib/gobject/init.c | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 lib/gobject/Makefile.am create mode 100644 lib/gobject/gobject.h create mode 100644 lib/gobject/init.c diff --git a/configure.ac b/configure.ac index 6569911..6c8f31e 100644 --- a/configure.ac +++ b/configure.ac @@ -596,6 +596,7 @@ AC_CONFIG_FILES([ examples/Makefile include/Makefile lib/Makefile + lib/gobject/Makefile lib/gtk/Makefile lib/misc/Makefile lib/unix/Makefile diff --git a/lib/Makefile.am b/lib/Makefile.am index ac17ba0..18b6859 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1 +1 @@ -SUBDIRS = gtk misc unix xlib xwidgets +SUBDIRS = gobject gtk misc unix xlib xwidgets diff --git a/lib/gobject/Makefile.am b/lib/gobject/Makefile.am new file mode 100644 index 0000000..b48a59e --- /dev/null +++ b/lib/gobject/Makefile.am @@ -0,0 +1,20 @@ +NULL = + +lib_LTLIBRARIES = $(libelk_gobject_la) +pkglib_LTLIBRARIES = $(gobject_la) + +if HAVE_GOBJECT +libelk_gobject_la = libelk-gobject.la +gobject_la = gobject.la +endif + +libelk_gobject_la_SOURCES = \ + $(NULL) +libelk_gobject_la_CFLAGS = @GOBJECT_CFLAGS@ +libelk_gobject_la_LDFLAGS = -no-undefined +libelk_gobject_la_LIBADD = $(top_builddir)/src/libelk.la @GOBJECT_LIBS@ + +gobject_la_SOURCES = init.c +gobject_la_CFLAGS = @GOBJECT_CFLAGS@ +gobject_la_LDFLAGS = -module -avoid-version -no-undefined +gobject_la_LIBADD = $(top_builddir)/src/libelk.la libelk-gobject.la @GOBJECT_LIBS@ diff --git a/lib/gobject/gobject.h b/lib/gobject/gobject.h new file mode 100644 index 0000000..aaf069c --- /dev/null +++ b/lib/gobject/gobject.h @@ -0,0 +1,33 @@ +/* gobject.h + * + * $Id$ + * + * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin + * Copyright 2002, 2003 Sam Hocevar , Paris + * + * This software was derived from Elk 1.2, which was Copyright 1987, 1988, + * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written + * by Oliver Laumann for TELES Telematic Services, Berlin, in a joint project + * between TELES and Nixdorf Microprocessor Engineering, Berlin). + * + * Oliver Laumann, TELES GmbH, Nixdorf Computer AG and Sam Hocevar, as co- + * owners or individual owners of copyright in this software, grant to any + * person or company a worldwide, royalty free, license to + * + * i) copy this software, + * ii) prepare derivative works based on this software, + * iii) distribute copies of this software or derivative works, + * iv) perform this software, or + * v) display this software, + * + * provided that this notice is not removed and that neither Oliver Laumann + * nor Teles nor Nixdorf are deemed to have made any representations as to + * the suitability of this software for any purpose nor are held responsible + * for any defects of this software. + * + * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. + */ + +#include +#include +#include "config.h" diff --git a/lib/gobject/init.c b/lib/gobject/init.c new file mode 100644 index 0000000..3e3625e --- /dev/null +++ b/lib/gobject/init.c @@ -0,0 +1,35 @@ +/* init.c + * + * $Id$ + * + * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin + * Copyright 2002, 2003 Sam Hocevar , Paris + * + * This software was derived from Elk 1.2, which was Copyright 1987, 1988, + * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written + * by Oliver Laumann for TELES Telematic Services, Berlin, in a joint project + * between TELES and Nixdorf Microprocessor Engineering, Berlin). + * + * Oliver Laumann, TELES GmbH, Nixdorf Computer AG and Sam Hocevar, as co- + * owners or individual owners of copyright in this software, grant to any + * person or company a worldwide, royalty free, license to + * + * i) copy this software, + * ii) prepare derivative works based on this software, + * iii) distribute copies of this software or derivative works, + * iv) perform this software, or + * v) display this software, + * + * provided that this notice is not removed and that neither Oliver Laumann + * nor Teles nor Nixdorf are deemed to have made any representations as to + * the suitability of this software for any purpose nor are held responsible + * for any defects of this software. + * + * THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. + */ + +#include "gobject.h" + +void elk_init_gobject_init () { + P_Provide (Intern ("gobject.la")); +}