aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog17
-rw-r--r--e-util/Makefile.am14
-rw-r--r--e-util/e-util-private.h30
-rw-r--r--e-util/e-win32-reloc.c25
4 files changed, 69 insertions, 17 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 7ce8ee8cee..bf0934b36e 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,20 @@
+2005-06-18 Tor Lillqvist <tml@novell.com>
+
+ * Makefile.am (WIN32_BOOTSTRAP_LIBS): Use bootstrap library for
+ libemisdwidgets. Code here uses e_utf8_to_locale_string() from
+ libemiscwidgets which hasn't been built yet if building from
+ scratch.
+ (GAL_IMAGESDIR): Remove, unused leftover.
+ (EVOLUTION_GLADEDIR): Add.
+ (libeutil_la_LDFLAGS, libeconduit_la_LDFLAGS): Use NO_UNDEFINED.
+ (libeutil_la_LIBADD, libeconduit_la_LIBADD): Link with necessary
+ libs.
+
+ * e-win32-reloc.c: Update now that it is here in evolution. Use _e
+ prefix instead of _gal. Add getters for more run-time paths.
+
+ * e-util-private.h: Corresponding changes.
+
2005-06-08 Srinivasa Ragavan <sragavan@novell.com>
* e-cursor.[ch]: Added functions to show busy cursor.
* Makefile.am: Add the files
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 599f93a051..7cc3ee1f26 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -2,6 +2,7 @@ eutilincludedir = $(privincludedir)/e-util
econdincludedir = $(privincludedir)/e-conduit
if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la
PLATFORM_SOURCES = e-win32-reloc.c
endif
@@ -9,13 +10,13 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
-DEVOLUTION_PREFIX=\""$(prefix)"\" \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
-DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \
-DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \
-DEVOLUTION_PLUGINDIR=\""$(plugindir)"\" \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
- -DGAL_IMAGESDIR=\""$(imagesdir)"\" \
-DG_LOG_DOMAIN=\"e-utils\" \
$(GNOME_PILOT_CFLAGS) \
$(EXTRA_GNOME_CFLAGS) \
@@ -127,7 +128,12 @@ libeutil_la_SOURCES = \
MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h
@EVO_MARSHAL_RULE@
-libeutil_la_LIBADD = $(E_UTIL_LIBS)
+libeutil_la_LDFLAGS = $(NO_UNDEFINED)
+
+libeutil_la_LIBADD = \
+ $(WIN32_BOOTSTRAP_LIBS) \
+ $(ICONV_LIBS) \
+ $(E_UTIL_LIBS)
econdinclude_HEADERS = \
e-pilot-map.h \
@@ -146,6 +152,10 @@ endif
libeconduit_la_SOURCES = $(pilot_compile)
+libeconduit_la_LDFLAGS = $(NO_UNDEFINED)
+
+libeconduit_la_LIBADD = $(E_UTIL_LIBS)
+
error_DATA = e-system.error
errordir = $(privdatadir)/errors
@EVO_PLUGIN_RULE@
diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h
index 13066d9f36..5e160fb657 100644
--- a/e-util/e-util-private.h
+++ b/e-util/e-util-private.h
@@ -28,18 +28,34 @@
#ifdef G_OS_WIN32
-const char *_gal_get_localedir (void) G_GNUC_CONST;
-const char *_gal_get_gladedir (void) G_GNUC_CONST;
-const char *_gal_get_imagesdir (void) G_GNUC_CONST;
+const char *_e_get_localedir (void) G_GNUC_CONST;
+const char *_e_get_gladedir (void) G_GNUC_CONST;
+const char *_e_get_images (void) G_GNUC_CONST;
+const char *_e_get_iconsdir (void) G_GNUC_CONST;
+const char *_e_get_category_icons (void) G_GNUC_CONST;
+const char *_e_get_plugindir (void) G_GNUC_CONST;
+const char *_e_get_privdatadir (void) G_GNUC_CONST;
#undef EVOLUTION_LOCALEDIR
-#define EVOLUTION_LOCALEDIR _gal_get_localedir ()
+#define EVOLUTION_LOCALEDIR _e_get_localedir ()
#undef EVOLUTION_GLADEDIR
-#define EVOLUTION_GLADEDIR _gal_get_gladedir ()
+#define EVOLUTION_GLADEDIR _e_get_gladedir ()
-#undef GAL_IMAGESDIR
-#define GAL_IMAGESDIR _gal_get_imagesdir ()
+#undef EVOLUTION_IMAGES
+#define EVOLUTION_IMAGES _e_get_images ()
+
+#undef EVOLUTION_ICONSDIR
+#define EVOLUTION_ICONSDIR _e_get_iconsdir ()
+
+#undef EVOLUTION_CATEGORY_ICONS
+#define EVOLUTION_CATEGORY_ICONS _e_get_category_icons ()
+
+#undef EVOLUTION_PLUGINDIR
+#define EVOLUTION_PLUGINDIR _e_get_plugindir ()
+
+#undef EVOLUTION_PRIVDATADIR
+#define EVOLUTION_PRIVDATADIR _e_get_privdatadir ()
#endif /* G_OS_WIN32 */
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c
index d737001ce1..2fd9496cfd 100644
--- a/e-util/e-win32-reloc.c
+++ b/e-util/e-win32-reloc.c
@@ -32,11 +32,15 @@
/* localedir uses system codepage as it is passed to the non-UTF8ified
* gettext library
*/
-static char *localedir = NULL;
+static const char *localedir = NULL;
/* The others are in UTF-8 */
-static char *gladedir;
-static char *imagesdir;
+static const char *gladedir;
+static const char *images;
+static const char *iconsdir;
+static const char *category_icons;
+static const char *plugindir;
+static const char *privdatadir;
static HMODULE hmodule;
G_LOCK_DEFINE_STATIC (mutex);
@@ -92,7 +96,10 @@ setup (void)
g_free (cp_prefix);
gladedir = replace_prefix (full_prefix, EVOLUTION_GLADEDIR);
- imagesdir = replace_prefix (full_prefix, GAL_IMAGESDIR);
+ images = replace_prefix (full_prefix, EVOLUTION_IMAGES);
+ category_icons = replace_prefix (full_prefix, EVOLUTION_CATEGORY_ICONS);
+ plugindir = replace_prefix (full_prefix, EVOLUTION_PLUGINDIR);
+ privdatadir = replace_prefix (full_prefix, EVOLUTION_PRIVDATADIR);
g_free (full_prefix);
G_UNLOCK (mutex);
@@ -102,7 +109,7 @@ setup (void)
#define GETTER(varbl) \
const char * \
-_gal_get_##varbl (void) \
+_e_get_##varbl (void) \
{ \
setup (); \
return varbl; \
@@ -110,6 +117,8 @@ _gal_get_##varbl (void) \
GETTER(localedir)
GETTER(gladedir)
-GETTER(imagesdir)
-
-
+GETTER(images)
+GETTER(iconsdir)
+GETTER(category_icons)
+GETTER(plugindir)
+GETTER(privdatadir)