diff options
| author | Havoc Pennington <hp@pobox.com> | 1999-11-23 04:04:28 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 1999-11-23 04:04:28 +0000 |
| commit | fcf002a4f14e21fdd672924be93c27546b31e1f7 (patch) | |
| tree | ac4e15df8364cd2ec767e8a14a04281025b8db28 /wrappers | |
| parent | f569fe855f4b237b87477b66b3a15ca7b4cee8df (diff) | |
| download | gconf-fcf002a4f14e21fdd672924be93c27546b31e1f7.tar.gz | |
split off LIBADD
1999-11-23 Havoc Pennington <hp@pobox.com>
* gconf/Makefile.am (libgconf_la_LDFLAGS): split off LIBADD
* wrappers/gtk/Makefile.am (libgconf_gtk_la_LIBADD): set shared
lib version
(libgconf_gtk_la_LDFLAGS): split LIBADD and
LDFLAGS maybe properly.
* configure.in: remove gnorba cflags/libs
* gconf/Makefile.am (install-data-local): Create the
$(sysconfdir)/gconf directory.
* wrappers/Makefile.am: For now, always
disable Guile wrapper
build.
Diffstat (limited to 'wrappers')
| -rw-r--r-- | wrappers/Makefile.am | 4 | ||||
| -rw-r--r-- | wrappers/gtk/Makefile.am | 5 | ||||
| -rw-r--r-- | wrappers/gtk/testgconfclient.c | 14 |
3 files changed, 13 insertions, 10 deletions
diff --git a/wrappers/Makefile.am b/wrappers/Makefile.am index 978e2f2b..f5246783 100644 --- a/wrappers/Makefile.am +++ b/wrappers/Makefile.am @@ -1,5 +1,7 @@ if GUILE -GUILE_SUBDIRS=guile +## disable always for now +##GUILE_SUBDIRS=guile +GUILE_SUBDIRS= else GUILE_SUBDIRS= endif diff --git a/wrappers/gtk/Makefile.am b/wrappers/gtk/Makefile.am index d0763ee0..44eb7d6c 100644 --- a/wrappers/gtk/Makefile.am +++ b/wrappers/gtk/Makefile.am @@ -10,10 +10,13 @@ gconfinclude_HEADERS = \ libgconf_gtk_la_SOURCES = \ gconf-client.c -libgconf_gtk_la_LIBADD = $(ORBIT_LIBS) $(GNOME_LIBS) +libgconf_gtk_la_LDFLAGS=-version-info $(GCONFGTK_CURRENT):$(GCONFGTK_REVISION):$(GCONFGTK_AGE) + +libgconf_gtk_la_LIBADD=$(OAF_LIBS) $(GNOME_LIBS) noinst_PROGRAMS= testgconfclient testgconfclient_SOURCES = testgconfclient.c testgconfclient_LDADD = $(ORBIT_LIBS) $(GNOME_LIBS) $(top_builddir)/gconf/libgconf.la $(top_builddir)/wrappers/gtk/libgconf-gtk.la + diff --git a/wrappers/gtk/testgconfclient.c b/wrappers/gtk/testgconfclient.c index 4aa81e13..93b13635 100644 --- a/wrappers/gtk/testgconfclient.c +++ b/wrappers/gtk/testgconfclient.c @@ -21,8 +21,9 @@ #include "gconf-client.h" #include <gnome.h> -#include <libgnorba/gnorba.h> +/* In real life these would be defined by configure.in, not in this + file. */ #define PACKAGE "testgconfclient" #define GNOMELOCALEDIR "/blah" #define VERSION "0.0.0.0.0.0.1alpha" @@ -32,15 +33,12 @@ static void create_controls(GConfClient* client); int main(int argc, char** argv) { - CORBA_Environment ev; GConfError* error = NULL; GConfClient* client = NULL; bindtextdomain(PACKAGE, GNOMELOCALEDIR); textdomain(PACKAGE); - CORBA_exception_init(&ev); - gnome_init(PACKAGE, VERSION, argc, argv); if (!gconf_init(argc, argv, &error)) @@ -54,7 +52,7 @@ main(int argc, char** argv) client = gconf_client_new(); - gconf_client_add_dir(client, "/testgconfclient", GCONF_CLIENT_PRELOAD_NONE, NULL); + gconf_client_add_dir(client, "/apps/gnome/testgconfclient", GCONF_CLIENT_PRELOAD_NONE, NULL); /* The main() function takes over the floating object */ gtk_object_ref(GTK_OBJECT(client)); @@ -200,13 +198,13 @@ create_controls(GConfClient* client) gtk_box_pack_end(GTK_BOX(vbox), quit_button, FALSE, FALSE, 0); - entry = entry_attached_to(client, "/testgconfclient/blah"); + entry = entry_attached_to(client, "/apps/gnome/testgconfclient/blah"); gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0); - entry = entry_attached_to(client, "/testgconfclient/foo"); + entry = entry_attached_to(client, "/apps/gnome/testgconfclient/foo"); gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0); - entry = entry_attached_to(client, "/testgconfclient/bar"); + entry = entry_attached_to(client, "/apps/gnome/testgconfclient/bar"); gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0); gtk_widget_show_all(win); |