Consolidate glue code into two libraries, libbeagleglue and libbeagleuiglue. Index: configure.in =================================================================== RCS file: /cvs/gnome/beagle/configure.in,v retrieving revision 1.180 diff -u -B -p -r1.180 configure.in --- configure.in 15 Sep 2005 16:37:21 -0000 1.180 +++ configure.in 1 Oct 2005 23:31:30 -0000 @@ -272,7 +272,7 @@ AC_SUBST(BEAGLE_UI_LIBS) dnl ---------------------------------------------- -# Gdk and Atk are needed for libtrayiconglue +# Gdk and Atk are needed for trayicon glue GDK20_MINIMUM_VERSION=2.2.3 ATK_MINIMUM_VERSION=1.2.4 Index: Best/BestTray.cs =================================================================== RCS file: /cvs/gnome/beagle/Best/BestTray.cs,v retrieving revision 1.23 diff -u -B -p -r1.23 BestTray.cs --- Best/BestTray.cs 19 Aug 2005 15:04:04 -0000 1.23 +++ Best/BestTray.cs 1 Oct 2005 23:31:30 -0000 @@ -72,7 +72,7 @@ namespace Best { Gtk.Tooltips tips; Beagle.Util.XKeybinder keybinder; - [DllImport ("libtrayiconglue")] + [DllImport ("libbeagleuiglue")] private static extern IntPtr egg_tray_icon_new (string name); public BestTray (BestWindow bw, bool autostarted) Index: Filters/FilterDOC.cs =================================================================== RCS file: /cvs/gnome/beagle/Filters/FilterDOC.cs,v retrieving revision 1.15 diff -u -B -p -r1.15 FilterDOC.cs --- Filters/FilterDOC.cs 10 Aug 2005 19:22:23 -0000 1.15 +++ Filters/FilterDOC.cs 1 Oct 2005 23:31:32 -0000 @@ -46,61 +46,61 @@ namespace Beagle.Filters { IntPtr byteHotArray, int hotDataLen, bool appendStructBrk); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern int wv1_init (); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern int wv1_glue_init_doc_parsing (string fname, TextHandlerCallback callback); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern IntPtr wv1_glue_get_ole_stream (string fname); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern IntPtr wv1_glue_get_ole_summary_stream (IntPtr oleStream); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern string wv1_glue_get_title (IntPtr smryStream); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern string wv1_glue_get_subject (IntPtr smryStream); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern string wv1_glue_get_author (IntPtr smryStream); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern string wv1_glue_get_keywords (IntPtr smryStream); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern string wv1_glue_get_comments (IntPtr smryStream); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern string wv1_glue_get_template (IntPtr smryStream); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern string wv1_glue_get_lastsavedby (IntPtr smryStream); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern string wv1_glue_get_revision_number (IntPtr smryStream); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern string wv1_glue_get_appname (IntPtr smryStream); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern Int32 wv1_glue_get_page_count (IntPtr smryStream); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern Int32 wv1_glue_get_word_count (IntPtr smryStream); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern Int32 wv1_glue_get_character_count (IntPtr smryStream); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern Int32 wv1_glue_get_security (IntPtr smryStream); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern Int16 wv1_glue_get_codepage (IntPtr smryStream); - [DllImport ("wv1glue")] + [DllImport ("libbeagleglue")] private static extern void wv1_glue_close_stream (IntPtr oleStream, IntPtr summary); ////////////////////////////////////////////////////////// Index: Util/DirectoryWalker.cs =================================================================== RCS file: /cvs/gnome/beagle/Util/DirectoryWalker.cs,v retrieving revision 1.6 diff -u -B -p -r1.6 DirectoryWalker.cs --- Util/DirectoryWalker.cs 10 Aug 2005 19:22:34 -0000 1.6 +++ Util/DirectoryWalker.cs 1 Oct 2005 23:31:33 -0000 @@ -52,7 +52,7 @@ namespace Beagle.Util { [DllImport ("libc", SetLastError = true)] private static extern int closedir (IntPtr dir); - [DllImport ("libbeagledglue", EntryPoint = "beagled_utils_readdir", SetLastError = true)] + [DllImport ("libbeagleglue", EntryPoint = "beagled_utils_readdir", SetLastError = true)] private static extern int sys_readdir (IntPtr dir, StringBuilder name); private static string readdir (IntPtr dir) Index: Util/GeckoUtils.cs =================================================================== RCS file: /cvs/gnome/beagle/Util/GeckoUtils.cs,v retrieving revision 1.3 diff -u -B -p -r1.3 GeckoUtils.cs --- Util/GeckoUtils.cs 27 May 2005 16:36:52 -0000 1.3 +++ Util/GeckoUtils.cs 1 Oct 2005 23:31:33 -0000 @@ -72,21 +72,21 @@ namespace Beagle.Util { SetFonts (); } - [DllImport("libgeckoglue.so")] + [DllImport("libbeagleuiglue")] static extern void blam_gecko_utils_init_services (); public static void Init () { blam_gecko_utils_init_services (); } - [DllImport("libgeckoglue.so")] + [DllImport("libbeagleuiglue")] static extern void blam_gecko_utils_set_font (int type, string font); public static void SetFont (int type, string font) { blam_gecko_utils_set_font (type, font); } - [DllImport("libgeckoglue.so")] + [DllImport("libbeagleuiglue")] static extern void blam_gecko_utils_set_proxy (bool use_proxy, string host, int port); public static void SetProxy (bool useProxy, string host, int port) Index: Util/Inotify.cs =================================================================== RCS file: /cvs/gnome/beagle/Util/Inotify.cs,v retrieving revision 1.54 diff -u -B -p -r1.54 Inotify.cs --- Util/Inotify.cs 8 Sep 2005 18:07:36 -0000 1.54 +++ Util/Inotify.cs 1 Oct 2005 23:31:36 -0000 @@ -93,21 +93,21 @@ namespace Beagle.Util { public uint len; } - [DllImport ("libinotifyglue")] + [DllImport ("libbeagleglue")] static extern int inotify_glue_init (); - [DllImport ("libinotifyglue")] + [DllImport ("libbeagleglue")] static extern int inotify_glue_watch (int fd, string filename, EventType mask); - [DllImport ("libinotifyglue")] + [DllImport ("libbeagleglue")] static extern int inotify_glue_ignore (int fd, int wd); - [DllImport ("libinotifyglue")] + [DllImport ("libbeagleglue")] static extern unsafe void inotify_snarf_events (int fd, out int nr, out IntPtr buffer); - [DllImport ("libinotifyglue")] + [DllImport ("libbeagleglue")] static extern void inotify_snarf_cancel (); ///////////////////////////////////////////////////////////////////////////////////// Index: Util/IoPriority.cs =================================================================== RCS file: /cvs/gnome/beagle/Util/IoPriority.cs,v retrieving revision 1.1 diff -u -B -p -r1.1 IoPriority.cs --- Util/IoPriority.cs 3 Aug 2005 01:34:39 -0000 1.1 +++ Util/IoPriority.cs 1 Oct 2005 23:31:36 -0000 @@ -33,7 +33,7 @@ namespace Beagle.Util { private IoPriority () {} // Static class - [DllImport ("libioprioglue")] + [DllImport ("libbeagleglue")] static extern int set_io_priority_idle (); static public void SetIdle () Index: Util/SystemInformation.cs =================================================================== RCS file: /cvs/gnome/beagle/Util/SystemInformation.cs,v retrieving revision 1.15 diff -u -B -p -r1.15 SystemInformation.cs --- Util/SystemInformation.cs 12 Jul 2005 17:39:03 -0000 1.15 +++ Util/SystemInformation.cs 1 Oct 2005 23:31:36 -0000 @@ -108,7 +108,7 @@ namespace Beagle.Util { External = 2 } - [DllImport ("libsysteminfoglue.so")] + [DllImport ("libbeagleglue.so")] extern static unsafe int screensaver_info (ScreenSaverState *state, ScreenSaverKind *kind, ulong *til_or_since, @@ -202,10 +202,10 @@ namespace Beagle.Util { /////////////////////////////////////////////////////////////// - [DllImport ("libsysteminfoglue.so")] + [DllImport ("libbeagleglue")] extern static int get_vmsize (); - [DllImport ("libsysteminfoglue.so")] + [DllImport ("libbeagleglue")] extern static int get_vmrss (); static public int VmSize { Index: Util/XKeybinder.cs =================================================================== RCS file: /cvs/gnome/beagle/Util/XKeybinder.cs,v retrieving revision 1.3 diff -u -B -p -r1.3 XKeybinder.cs --- Util/XKeybinder.cs 16 Nov 2004 03:08:21 -0000 1.3 +++ Util/XKeybinder.cs 1 Oct 2005 23:31:37 -0000 @@ -8,14 +8,14 @@ namespace Beagle.Util { public class XKeybinder { - [DllImport("libkeyglue")] + [DllImport("libbeagleuiglue")] static extern void tomboy_keybinder_init (); - [DllImport("libkeyglue")] + [DllImport("libbeagleuiglue")] static extern void tomboy_keybinder_bind (string keystring, BindkeyHandler handler); - [DllImport("libkeyglue")] + [DllImport("libbeagleuiglue")] static extern void tomboy_keybinder_unbind (string keystring, BindkeyHandler handler); Index: glue/Makefile.am =================================================================== RCS file: /cvs/gnome/beagle/glue/Makefile.am,v retrieving revision 1.13 diff -u -B -p -r1.13 Makefile.am --- glue/Makefile.am 11 Aug 2005 16:04:23 -0000 1.13 +++ glue/Makefile.am 1 Oct 2005 23:31:40 -0000 @@ -1,76 +1,87 @@ INCLUDES= \ - $(LIBGECKOGLUE_CFLAGS) \ - $(LIBTRAYICON_CFLAGS) \ - -I$(MOZILLA_INCLUDE_ROOT)/content \ - -I$(MOZILLA_INCLUDE_ROOT)/dom \ - -I$(MOZILLA_INCLUDE_ROOT)/find \ - -I$(MOZILLA_INCLUDE_ROOT)/locale \ - -I$(MOZILLA_INCLUDE_ROOT)/webbrwsr \ - -I$(MOZILLA_INCLUDE_ROOT)/string \ - -I$(MOZILLA_INCLUDE_ROOT)/pref \ - -I$(MOZILLA_INCLUDE_ROOT)/gfx \ - -I$(MOZILLA_INCLUDE_ROOT)/embedstring \ - -I$(MOZILLA_INCLUDE_ROOT)/chrome \ - -DALLOW_PRIVATE_API \ - -DMOZILLA_HOME=\""$(MOZILLA_HOME)\"" \ - -include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h + $(LIBGECKOGLUE_CFLAGS) \ + $(LIBTRAYICON_CFLAGS) \ + -I$(MOZILLA_INCLUDE_ROOT)/content \ + -I$(MOZILLA_INCLUDE_ROOT)/dom \ + -I$(MOZILLA_INCLUDE_ROOT)/find \ + -I$(MOZILLA_INCLUDE_ROOT)/locale \ + -I$(MOZILLA_INCLUDE_ROOT)/webbrwsr \ + -I$(MOZILLA_INCLUDE_ROOT)/string \ + -I$(MOZILLA_INCLUDE_ROOT)/pref \ + -I$(MOZILLA_INCLUDE_ROOT)/gfx \ + -I$(MOZILLA_INCLUDE_ROOT)/embedstring \ + -I$(MOZILLA_INCLUDE_ROOT)/chrome \ + -DALLOW_PRIVATE_API \ + -DMOZILLA_HOME=\""$(MOZILLA_HOME)\"" \ + -include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h -if ENABLE_WV1 -INCLUDES += \ - $(WV1_CFLAGS) -endif +COND_GLUE_SOURCES = +COND_GLUE_LIBADD = -gluelibdir = $(pkglibdir) - -gluelib_LTLIBRARIES = \ - libinotifyglue.la \ - libioprioglue.la \ - libsysteminfoglue.la \ - libgeckoglue.la \ - libkeyglue.la \ - libtrayiconglue.la \ - libbeagledglue.la - -libbeagledglue_la_SOURCES = \ +BEAGLED_GLUE_SOURCES = \ beagled-utils.c -if ENABLE_WV1 -gluelib_LTLIBRARIES += \ - libwv1glue.la -endif - -libinotifyglue_la_SOURCES = \ +INOTIFY_GLUE_SOURCES = \ inotify.h \ inotify-syscalls.h \ inotify-glue.c -libioprioglue_la_SOURCES = \ +IOPRIO_GLUE_SOURCES = \ ioprio-glue.c -libsysteminfoglue_la_SOURCES = \ +SYSINFO_GLUE_SOURCES = \ screensaver-glue.c \ vmsize-glue.c -libsysteminfoglue_la_LIBADD = $(SYSTEMINFO_GLUE_LIBS) $(SYSTEMINFO_GLUE_X_LIBS) +SYSINFO_GLUE_LIBADD = $(SYSTEMINFO_GLUE_LIBS) $(SYSTEMINFO_GLUE_X_LIBS) -libgeckoglue_la_SOURCES= \ - gecko-utils.h \ +GECKO_GLUE_SOURCES = \ + gecko-utils.h \ gecko-utils.cpp -libgeckoglue_la_LIBADD=$(LIBGECKOGLUE_LIBS) -libkeyglue_la_SOURCES = \ - tomboykeybinder.c \ - tomboykeybinder.h \ - eggaccelerators.c \ +GECKO_GLUE_LIBADD = $(LIBGECKOGLUE_LIBS) + +KEY_GLUE_SOURCES = \ + tomboykeybinder.c \ + tomboykeybinder.h \ + eggaccelerators.c \ eggaccelerators.h -libtrayiconglue_la_SOURCES = \ +TRAYICON_GLUE_SOURCES = \ eggtrayicon.c \ eggtrayicon.h -libtrayiconglue_la_LIBADD = $(LIBTRAYICON_LIBS) +TRAYICON_GLUE_LIBADD = $(LIBTRAYICON_LIBS) if ENABLE_WV1 -libwv1glue_la_SOURCES = \ +INCLUDES += \ + $(WV1_CFLAGS) +COND_GLUE_SOURCES += \ wv1-glue.c -libwv1glue_la_LIBADD = \ +COND_GLUE_LIBADD += \ $(WV1_LIBS) endif + +libbeagleglue_la_SOURCES = \ + $(BEAGLED_GLUE_SOURCES) \ + $(INOTIFY_GLUE_SOURCES) \ + $(IOPRIO_GLUE_SOURCES) \ + $(SYSINFO_GLUE_SOURCES) \ + $(COND_GLUE_SOURCES) + +libbeagleglue_la_LIBADD = \ + $(SYSINFO_GLUE_LIBADD) \ + $(COND_GLUE_LIBADD) + +libbeagleuiglue_la_SOURCES = \ + $(GECKO_GLUE_SOURCES) \ + $(KEY_GLUE_SOURCES) \ + $(TRAYICON_GLUE_SOURCES) + +libbeagleuiglue_la_LIBADD = \ + $(GECKO_GLUE_LIBADD) \ + $(TRAYICON_GLUE_LIBADD) + +gluelibdir = $(pkglibdir) +gluelib_LTLIBRARIES = \ + libbeagleglue.la \ + libbeagleuiglue.la +