Commit 22d8ecdc authored by Johannes Schmid's avatar Johannes Schmid Committed by Johannes Schmid

Split the library into libgdl (gtk only) and libgdl-gnome (with gnome

2006-09-18  Johannes Schmid <jhs@gnome.org>

	* configure.in:
	* gdl-gnome-1.0.pc.in (added):
	* gdl/Makefile.am:

	Split the library into libgdl (gtk only) and libgdl-gnome (with gnome support)
	Bumped version to 0.7.0 (because of obvious API changes)
parent 83541ba8
2006-09-18 Johannes Schmid <jhs@gnome.org>
* configure.in:
* gdl-gnome-1.0.pc.in (added):
* gdl/Makefile.am:
Split the library into libgdl (gtk only) and libgdl-gnome (with gnome support)
Bumped version to 0.7.0 (because of obvious API changes)
2006-07-31 Johannes Schmid <jhs@gnome.org>
* gdl/gdl-tools.c (removed):
......
......@@ -9,7 +9,7 @@ EXTRA_DIST = \
intltool-update.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gdl-1.0.pc
pkgconfig_DATA = gdl-1.0.pc gdl-gnome-1.0.pc
CLEANFILES = gdl-1.0.pc intltool-extract intltool-merge intltool-update
......
......@@ -10,8 +10,8 @@ AC_INIT(gdl)
AM_CONFIG_HEADER(config.h)
GDL_MAJOR_VERSION=0
GDL_MINOR_VERSION=6
GDL_MICRO_VERSION=1
GDL_MINOR_VERSION=7
GDL_MICRO_VERSION=0
PACKAGE=gdl
GDL_VERSION=$GDL_MAJOR_VERSION.$GDL_MINOR_VERSION.$GDL_MICRO_VERSION
......@@ -35,14 +35,12 @@ AC_SUBST(SNAPSHOT)
GTK_REQUIRED=2.4.0
GNOME_REQUIRED=2.6.0
BONOBOUI_REQUIRED=2.2.0
XML_REQUIRED=2.2.8
LIBGLADE_REQUIRED=2.0.0
GNOME_VFS_REQUIRED=2.6.0
AC_SUBST(GTK_REQUIRED)
AC_SUBST(GNOME_REQUIRED)
AC_SUBST(BONOBOUI_REQUIRED)
AC_SUBST(XML_REQUIRED)
AC_SUBST(LIBGLADE_REQUIRED)
......@@ -64,7 +62,7 @@ AC_PROG_LIBTOOL
dnl ***************
dnl GNOME Libraries
dnl GTK Libraries
dnl ***************
PKG_CHECK_MODULES(XML, libxml-2.0 >= $XML_REQUIRED)
......@@ -166,4 +164,5 @@ gdl/Makefile
po/Makefile.in
gdl.spec
gdl-1.0.pc
gdl-gnome-1.0.pc
])
......@@ -6,7 +6,7 @@ idldir=@datadir@/idl/libgdl-1.0
Name: gdl
Description: Gnome DevTool Libraries
Version: @VERSION@
Version: @VERSION@@GTK_ONLY@
Requires: libbonoboui-2.0 libgnome-2.0 gtk+-2.0 libxml-2.0 libglade-2.0
Libs: -L${libdir} -lgdl-1
Cflags: -I${includedir}
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/libgdl-1.0
idldir=@datadir@/idl/libgdl-1.0
Name: gdl-gnome
Description: Gnome DevTool Libraries - Gnome part
Version: @VERSION@
Requires: libbonoboui-2.0 libgnome-2.0 gtk+-2.0 libxml-2.0 libglade-2.0
Libs: -L${libdir} -lgdl-1 -lgdl-gnome-1
Cflags: -I${includedir}
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdl\" \
-DGDL_GLADEDIR=\""$(gladedir)"\" \
-I$(includedir) -I$(top_srcdir) \
$(WARN_CFLAGS) $(DEPRECATED_FLAGS) \
$(GDL_DEPENDENCIES_CFLAGS) $(XML_CFLAGS) \
$(GNOME_CFLAGS) \
$(EXTRA_CPPFLAGS)
lib_LTLIBRARIES = libgdl-1.la
BUILT_SOURCES = \
libgdlmarshal.c \
libgdlmarshal.h \
libgdltypebuiltins.c \
libgdltypebuiltins.h \
gdl-stock-icons.h
CLEANFILES = \
libgdltypebuiltins.c \
libgdltypebuiltins.h \
libgdlmarshal.c \
libgdlmarshal.h
libgdl_headers = \
gdl.h \
gdl-tools.h \
gdl-dock-object.h \
gdl-dock-master.h \
gdl-dock.h \
gdl-dock-item.h \
gdl-dock-notebook.h \
gdl-dock-paned.h \
gdl-dock-tablabel.h \
gdl-dock-layout.h \
gdl-dock-placeholder.h \
gdl-dock-bar.h \
gdl-combo-button.h \
gdl-stock.h \
gdl-stock-icons.h
if HAVE_GNOME
libgdl_headers += \
gdl-icons.h
endif
libgdl_1_la_SOURCES = \
$(libgdl_headers) \
gdl-i18n.h \
gdl-i18n.c \
gdl-dock-object.c \
gdl-dock-master.c \
gdl-dock.c \
gdl-dock-item.c \
gdl-dock-item-grip.h \
gdl-dock-item-grip.c \
gdl-dock-notebook.c \
gdl-dock-paned.c \
gdl-dock-tablabel.c \
gdl-dock-layout.c \
gdl-dock-placeholder.c \
gdl-dock-bar.c \
gdl-combo-button.c \
gdl-stock.c \
libgdltypebuiltins.h \
libgdltypebuiltins.c \
libgdlmarshal.h \
libgdlmarshal.c
if HAVE_GNOME
libgdl_1_la_SOURCES += \
gdl-icons.c
endif
libgdl_1_la_LIBADD = \
$(GDL_DEPENDENCIES_LIBS) \
$(XML_LIBS) \
$(GNOME_LIBS)
libgdl_1_la_LDFLAGS = $(EXTRA_LDFLAGS)
noinst_PROGRAMS=test-dock test-combo-button
test_dock_sources=test-dock.c
test_dock_LDADD=libgdl-1.la $(XML_LIBS)
test_combo_button_SOURCES = test-combo-button.c
test_combo_button_LDADD = libgdl-1.la
if HAVE_GNOME
noinst_PROGRAMS += test-dataview
test_dataview_SOURCES = \
gdl-data-view.h \
gdl-data-view.c \
gdl-data-frame.h \
gdl-data-frame.c \
gdl-data-model.h \
gdl-data-model.c \
gdl-data-model-test.h \
gdl-data-model-test.c \
gdl-data-row.h \
gdl-data-row.c \
test-dataview.c
test_dataview_LDADD = libgdl-1.la
endif
libgdlincludedir = $(includedir)/libgdl-1.0/gdl
libgdlinclude_HEADERS = \
$(libgdl_headers) \
libgdltypebuiltins.h
gladedir = $(datadir)/gdl/glade
glade_DATA = layout.glade
STOCK_ICONS = \
stock_close_icon stock-close-12.png \
stock_menu_left_icon stock-menu-left-12.png \
stock_menu_right_icon stock-menu-right-12.png
STOCK_IMAGES = \
stock-close-12.png \
stock-menu-left-12.png \
stock-menu-right-12.png
EXTRA_DIST = libgdlmarshal.list \
tree-expand.xpm \
tree-contract.xpm \
layout.glade \
program.xpm static.xpm shared.xpm \
$(STOCK_IMAGES)
# enumerations code generation
libgdltypebuiltins.c: $(libgdl_headers)
@GLIB_MKENUMS@ \
--fhead "#include <glib-object.h>\n" \
--fhead "#include \"libgdltypebuiltins.h\"\n\n" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "static const G@Type@Value _@enum_name@_values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n};\n\n" \
--vtail "GType\n@enum_name@_get_type (void)\n{\n" \
--vtail " static GType type = 0;\n\n" \
--vtail " if (!type)\n" \
--vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
--vtail " return type;\n}\n\n" \
$(libgdl_headers) > xgen-gtbec \
&& cp xgen-gtbec $(@F) \
&& rm -f xgen-gtbec
libgdltypebuiltins.h: $(libgdl_headers)
@GLIB_MKENUMS@ \
--fhead "#ifndef __LIBGDLTYPEBUILTINS_H__\n" \
--fhead "#define __LIBGDLTYPEBUILTINS_H__ 1\n\n" \
--fhead "#include <gdl/gdl.h>\n\n" \
--fhead "G_BEGIN_DECLS\n\n" \
--ftail "G_END_DECLS\n\n" \
--ftail "#endif /* __LIBGDLTYPEBUILTINS_H__ */\n" \
--fprod "\n/* --- @filename@ --- */" \
--eprod "#define GDL_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
--eprod "GType @enum_name@_get_type (void);\n" \
$(libgdl_headers) > xgen-gth \
&& cp xgen-gth $(@F) \
&& rm -f xgen-gth
libgdlmarshal.h: libgdlmarshal.list
@GLIB_GENMARSHAL@ \
--prefix=gdl_marshal $(srcdir)/libgdlmarshal.list --header > xgen-gmc \
&& cp xgen-gmc $(@F) \
&& rm -f xgen-gmc
libgdlmarshal.c: libgdlmarshal.h
echo "#include \"libgdlmarshal.h\"" > xgen-gmc \
&& @GLIB_GENMARSHAL@ \
--prefix=gdl_marshal $(srcdir)/libgdlmarshal.list --body >> xgen-gmc \
&& cp xgen-gmc $(@F) \
&& rm -f xgen-gmc
gdl-stock-icons.h: $(STOCK_IMAGES)
gdk-pixbuf-csource --raw --build-list $(STOCK_ICONS) > $@
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdl\" \
-DGDL_GLADEDIR=\""$(gladedir)"\" \
-I$(includedir) -I$(top_srcdir) \
$(WARN_CFLAGS) $(DEPRECATED_FLAGS) \
$(GDL_DEPENDENCIES_CFLAGS) $(XML_CFLAGS) \
$(GNOME_CFLAGS) \
$(EXTRA_CPPFLAGS)
lib_LTLIBRARIES = libgdl-1.la
BUILT_SOURCES = \
libgdlmarshal.c \
libgdlmarshal.h \
libgdltypebuiltins.c \
libgdltypebuiltins.h \
gdl-stock-icons.h
CLEANFILES = \
libgdltypebuiltins.c \
libgdltypebuiltins.h \
libgdlmarshal.c \
libgdlmarshal.h
libgdl_headers = \
gdl.h \
gdl-tools.h \
gdl-dock-object.h \
gdl-dock-master.h \
gdl-dock.h \
gdl-dock-item.h \
gdl-dock-notebook.h \
gdl-dock-paned.h \
gdl-dock-tablabel.h \
gdl-dock-layout.h \
gdl-dock-placeholder.h \
gdl-dock-bar.h \
gdl-combo-button.h \
gdl-stock.h \
gdl-stock-icons.h
libgdl_1_la_SOURCES = \
$(libgdl_headers) \
gdl-i18n.h \
gdl-i18n.c \
gdl-dock-object.c \
gdl-dock-master.c \
gdl-dock.c \
gdl-dock-item.c \
gdl-dock-item-grip.h \
gdl-dock-item-grip.c \
gdl-dock-notebook.c \
gdl-dock-paned.c \
gdl-dock-tablabel.c \
gdl-dock-layout.c \
gdl-dock-placeholder.c \
gdl-dock-bar.c \
gdl-combo-button.c \
gdl-stock.c \
libgdltypebuiltins.h \
libgdltypebuiltins.c \
libgdlmarshal.h \
libgdlmarshal.c
libgdl_1_la_LIBADD = \
$(GDL_DEPENDENCIES_LIBS) \
$(XML_LIBS) \
$(GNOME_LIBS)
libgdl_1_la_LDFLAGS = $(EXTRA_LDFLAGS)
libgdl_gnome_headers = \
gdl-icons.h
if HAVE_GNOME
lib_LTLIBRARIES += libgdl-gnome-1.la
endif
libgdl_gnome_1_la_SOURCES = \
$(libgdl_gnome_headers) \
gdl-icons.c
libgdl_gnome_1_la_LIBADD = \
$(GDL_DEPENDENCIES_LIBS) \
$(XML_LIBS) \
$(GNOME_LIBS)
libgdl_gnome_1_la_LDFLAGS = $(EXTRA_LDFLAGS)
noinst_PROGRAMS=test-dock test-combo-button
test_dock_sources=test-dock.c
test_dock_LDADD=libgdl-1.la $(XML_LIBS)
test_combo_button_SOURCES = test-combo-button.c
test_combo_button_LDADD = libgdl-1.la
if HAVE_GNOME
noinst_PROGRAMS += test-dataview
test_dataview_SOURCES = \
gdl-data-view.h \
gdl-data-view.c \
gdl-data-frame.h \
gdl-data-frame.c \
gdl-data-model.h \
gdl-data-model.c \
gdl-data-model-test.h \
gdl-data-model-test.c \
gdl-data-row.h \
gdl-data-row.c \
test-dataview.c
test_dataview_LDADD = libgdl-1.la libgdl-gnome-1.la
endif
libgdlincludedir = $(includedir)/libgdl-1.0/gdl
libgdlinclude_HEADERS = \
$(libgdl_headers) \
libgdltypebuiltins.h
libgdl_gnomeincludedir = $(includedir)/libgdl-1.0/gdl
libgdl_gnomeinclude_HEADERS = \
$(libgdl_gnome_headers)
gladedir = $(datadir)/gdl/glade
glade_DATA = layout.glade
STOCK_ICONS = \
stock_close_icon stock-close-12.png \
stock_menu_left_icon stock-menu-left-12.png \
stock_menu_right_icon stock-menu-right-12.png
STOCK_IMAGES = \
stock-close-12.png \
stock-menu-left-12.png \
stock-menu-right-12.png
EXTRA_DIST = libgdlmarshal.list \
tree-expand.xpm \
tree-contract.xpm \
layout.glade \
program.xpm static.xpm shared.xpm \
$(STOCK_IMAGES)
# enumerations code generation
libgdltypebuiltins.c: $(libgdl_headers)
@GLIB_MKENUMS@ \
--fhead "#include <glib-object.h>\n" \
--fhead "#include \"libgdltypebuiltins.h\"\n\n" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "static const G@Type@Value _@enum_name@_values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n};\n\n" \
--vtail "GType\n@enum_name@_get_type (void)\n{\n" \
--vtail " static GType type = 0;\n\n" \
--vtail " if (!type)\n" \
--vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
--vtail " return type;\n}\n\n" \
$(libgdl_headers) > xgen-gtbec \
&& cp xgen-gtbec $(@F) \
&& rm -f xgen-gtbec
libgdltypebuiltins.h: $(libgdl_headers)
@GLIB_MKENUMS@ \
--fhead "#ifndef __LIBGDLTYPEBUILTINS_H__\n" \
--fhead "#define __LIBGDLTYPEBUILTINS_H__ 1\n\n" \
--fhead "#include <gdl/gdl.h>\n\n" \
--fhead "G_BEGIN_DECLS\n\n" \
--ftail "G_END_DECLS\n\n" \
--ftail "#endif /* __LIBGDLTYPEBUILTINS_H__ */\n" \
--fprod "\n/* --- @filename@ --- */" \
--eprod "#define GDL_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
--eprod "GType @enum_name@_get_type (void);\n" \
$(libgdl_headers) > xgen-gth \
&& cp xgen-gth $(@F) \
&& rm -f xgen-gth
libgdlmarshal.h: libgdlmarshal.list
@GLIB_GENMARSHAL@ \
--prefix=gdl_marshal $(srcdir)/libgdlmarshal.list --header > xgen-gmc \
&& cp xgen-gmc $(@F) \
&& rm -f xgen-gmc
libgdlmarshal.c: libgdlmarshal.h
echo "#include \"libgdlmarshal.h\"" > xgen-gmc \
&& @GLIB_GENMARSHAL@ \
--prefix=gdl_marshal $(srcdir)/libgdlmarshal.list --body >> xgen-gmc \
&& cp xgen-gmc $(@F) \
&& rm -f xgen-gmc
gdl-stock-icons.h: $(STOCK_IMAGES)
gdk-pixbuf-csource --raw --build-list $(STOCK_ICONS) > $@
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