pidgin.win32.autotools: df6c2985: Reduce the number of OS_WIN32 conditiona...
datallah at pidgin.im
datallah at pidgin.im
Wed Nov 3 15:45:47 EDT 2010
----------------------------------------------------------------------
Revision: df6c2985ad2ffd21ee201882b834fe46826e9fcd
Parent: 99714ea8abf713bd5f4c137898f7c84823f26675
Author: datallah at pidgin.im
Date: 11/03/10 15:39:59
Branch: im.pidgin.pidgin.win32.autotools
URL: http://d.pidgin.im/viewmtn/revision/info/df6c2985ad2ffd21ee201882b834fe46826e9fcd
Changelog:
Reduce the number of OS_WIN32 conditionals in the Makefiles.
The DATADIR definition needed to be changed to PURPLE_DATADIR because
DATADIR is defined within the mingw gcc internal headers.
Changes against parent 99714ea8abf713bd5f4c137898f7c84823f26675
patched configure.ac
patched finch/Makefile.am
patched finch/gntsound.c
patched finch/libgnt/wms/Makefile.am
patched finch/plugins/Makefile.am
patched libpurple/Makefile.am
patched libpurple/certificate.c
patched libpurple/example/Makefile.am
patched libpurple/plugins/Makefile.am
patched libpurple/plugins/perl/Makefile.am
patched libpurple/plugins/ssl/Makefile.am
patched libpurple/win32/win32dep.h
patched pidgin/Makefile.am
patched pidgin/gtkblist.c
patched pidgin/gtkdialogs.c
patched pidgin/gtkdnd-hints.c
patched pidgin/gtkdocklet-gtk.c
patched pidgin/gtkmain.c
patched pidgin/gtkprefs.c
patched pidgin/gtksound.c
patched pidgin/gtkthemes.c
patched pidgin/gtkutils.c
patched pidgin/pidginstock.c
patched pidgin/plugins/Makefile.am
patched pidgin/plugins/cap/Makefile.am
patched pidgin/plugins/disco/Makefile.am
patched pidgin/plugins/disco/gtkdisco.c
patched pidgin/plugins/gestures/Makefile.am
patched pidgin/plugins/gevolution/Makefile.am
patched pidgin/plugins/musicmessaging/Makefile.am
patched pidgin/plugins/musicmessaging/musicmessaging.c
patched pidgin/plugins/ticker/Makefile.am
patched pidgin/plugins/win32/transparency/Makefile.am
patched pidgin/plugins/win32/winprefs/Makefile.am
-------------- next part --------------
============================================================
--- configure.ac 17ff51e3963757857de0aa951276ac270d5cb91f
+++ configure.ac 964e83aa1536282679c6bbf82fda3190a2fae0a4
@@ -132,6 +132,7 @@ case "$host" in
AVOID_VERSION='-avoid-version'
AC_CHECK_TOOL(WINDRES, windres)
PURPLE_LIBS='$(top_builddir)/libpurple/libpurple.la'
+ PIDGIN_LIBS='$(top_builddir)/pidgin/libpidgin.la'
;;
*)
os_win32=no
@@ -139,6 +140,7 @@ case "$host" in
NO_UNDEFINED=
AVOID_VERSION=
PURPLE_LIBS=
+ PIDGIN_LIBS=
;;
esac
AC_MSG_RESULT([$os_win32])
@@ -146,8 +148,8 @@ AC_SUBST(PURPLE_LIBS)
AC_SUBST(NO_UNDEFINED)
AC_SUBST(AVOID_VERSION)
AC_SUBST(PURPLE_LIBS)
+AC_SUBST(PIDGIN_LIBS)
-
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
============================================================
--- pidgin/plugins/ticker/Makefile.am f001700235cff855b00fba7abeefd15c008a8181
+++ pidgin/plugins/ticker/Makefile.am 927aa1c96361f0f2cd2443b3685c12e5431f4752
@@ -18,17 +18,12 @@ ticker_la_SOURCES = \
gtkticker.h \
ticker.c
-if OS_WIN32
-PIDGIN_LIBS = $(top_builddir)/pidgin/.libs/libpidgin.la
-else
-PIDGIN_LIBS =
-endif
-
ticker_la_LIBADD = $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS)
endif
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/pidgin \
@@ -39,7 +34,4 @@ AM_CPPFLAGS += \
AM_CPPFLAGS += \
-I$(top_srcdir)/libpurple/win32 \
-I$(top_srcdir)/pidgin/win32
-else
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\"
endif
============================================================
--- libpurple/win32/win32dep.h f9d2217ac6c3b4afaed8625869c16efa68f376b8
+++ libpurple/win32/win32dep.h 758980a937e7a1223576f23ece3428fd8b1cf36b
@@ -81,9 +81,14 @@ long wpurple_get_tz_offset(void);
/*
* Purple specific
*/
-#define DATADIR wpurple_share_dir()
+#undef PURPLE_DATADIR
+#define PURPLE_DATADIR wpurple_share_dir()
+#undef LIBDIR
#define LIBDIR wpurple_lib_dir()
+#undef LOCALEDIR
#define LOCALEDIR wpurple_locale_dir()
+/* TODO: SYSCONFDIR should be the allusers AppData? */
+#undef SYSCONFDIR
#ifdef __cplusplus
}
============================================================
--- pidgin/gtkutils.c ac3fe57287f1edfe7c47fd07af973a84f2f5e9ca
+++ pidgin/gtkutils.c c735e23fcbcd305d7ff4c30862fb2f1ed7bf2852
@@ -614,7 +614,7 @@ pidgin_create_prpl_icon_from_prpl(Purple
*/
tmp = g_strconcat(protoname, ".png", NULL);
- filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
+ filename = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "protocols",
size == PIDGIN_PRPL_ICON_SMALL ? "16" :
size == PIDGIN_PRPL_ICON_MEDIUM ? "22" : "48",
tmp, NULL);
@@ -703,7 +703,7 @@ create_protocols_menu(const char *defaul
plugin = (PurplePlugin *)p->data;
if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) {
- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
+ char *filename = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "protocols",
"16", "google-talk.png", NULL);
GtkWidget *item;
============================================================
--- pidgin/plugins/gestures/Makefile.am fa2bfd5ad6f7eb214079abc09b5003fe3972d63d
+++ pidgin/plugins/gestures/Makefile.am 65b59266460892febc24ca992633918fdeb0d2fa
@@ -17,24 +17,14 @@ gestures_la_SOURCES = \
stroke.c \
stroke-draw.c
-if OS_WIN32
-PIDGIN_LIBS = $(top_builddir)/pidgin/.libs/libpidgin.la
-else
-PIDGIN_LIBS =
-endif
-
gestures_la_LIBADD = $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS)
endif
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/pidgin \
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS)
-
-if !OS_WIN32
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\"
-endif
============================================================
--- libpurple/plugins/perl/Makefile.am a1220aecd784c33318aed96536fc8c9a231eddb7
+++ libpurple/plugins/perl/Makefile.am f6ce9c2c8d2c10a84d5a4cbc6abad19624768912
@@ -161,6 +161,7 @@ AM_CPPFLAGS = \
fi
AM_CPPFLAGS = \
+ -DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)\" \
-I$(top_srcdir) \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
@@ -168,8 +169,3 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS) \
$(PERL_CFLAGS)
-
-if !OS_WIN32
-AM_CPPFLAGS += \
- -DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)\"
-endif
============================================================
--- pidgin/gtkblist.c 849ad4c8761af32a534733bd3124544c69978fd6
+++ pidgin/gtkblist.c 84dd08e0b030462b2d237b0b5acb22d1e8566a77
@@ -3388,14 +3388,14 @@ static char *get_mood_icon_path(const ch
char *path;
if (!strcmp(mood, "busy")) {
- path = g_build_filename(DATADIR, "pixmaps", "pidgin",
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin",
"status", "16", "busy.png", NULL);
} else if (!strcmp(mood, "hiptop")) {
- path = g_build_filename(DATADIR, "pixmaps", "pidgin",
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin",
"emblems", "16", "hiptop.png", NULL);
} else {
char *filename = g_strdup_printf("%s.png", mood);
- path = g_build_filename(DATADIR, "pixmaps", "pidgin",
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin",
"emotes", "small", filename, NULL);
g_free(filename);
}
@@ -4041,7 +4041,7 @@ pidgin_blist_get_emblem(PurpleBlistNode
if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_MOBILE)) {
/* This emblem comes from the small emoticon set now,
* to reduce duplication. */
- path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emotes",
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emotes",
"small", "mobile.png", NULL);
return _pidgin_blist_get_cached_emblem(path);
}
@@ -4058,7 +4058,7 @@ pidgin_blist_get_emblem(PurpleBlistNode
g_return_val_if_fail(buddy != NULL, NULL);
if (!purple_privacy_check(buddy->account, purple_buddy_get_name(buddy))) {
- path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "blocked.png", NULL);
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emblems", "16", "blocked.png", NULL);
return _pidgin_blist_get_cached_emblem(path);
}
@@ -4069,7 +4069,7 @@ pidgin_blist_get_emblem(PurpleBlistNode
if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_MOBILE)) {
/* This emblem comes from the small emoticon set now, to reduce duplication. */
- path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emotes", "small", "mobile.png", NULL);
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emotes", "small", "mobile.png", NULL);
return _pidgin_blist_get_cached_emblem(path);
}
@@ -4078,18 +4078,18 @@ pidgin_blist_get_emblem(PurpleBlistNode
/* Only in MSN.
* TODO: Replace "Tune" with generalized "Media" in 3.0. */
if (purple_status_get_attr_string(tune, "game") != NULL) {
- path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "game.png", NULL);
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emblems", "16", "game.png", NULL);
return _pidgin_blist_get_cached_emblem(path);
}
/* Only in MSN.
* TODO: Replace "Tune" with generalized "Media" in 3.0. */
if (purple_status_get_attr_string(tune, "office") != NULL) {
- path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "office.png", NULL);
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emblems", "16", "office.png", NULL);
return _pidgin_blist_get_cached_emblem(path);
}
/* Regular old "tune" is the only one in all protocols. */
/* This emblem comes from the small emoticon set now, to reduce duplication. */
- path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emotes", "small", "music.png", NULL);
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emotes", "small", "music.png", NULL);
return _pidgin_blist_get_cached_emblem(path);
}
@@ -4116,7 +4116,7 @@ pidgin_blist_get_emblem(PurpleBlistNode
path = get_mood_icon_path(name);
} else {
filename = g_strdup_printf("%s.png", name);
- path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", filename, NULL);
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emblems", "16", filename, NULL);
g_free(filename);
}
============================================================
--- pidgin/gtkprefs.c ed8907772243531324fbac51bb8720dc2c96bc92
+++ pidgin/gtkprefs.c 3bd511912343e91b48445e8b62fd0213babcf3dd
@@ -528,7 +528,7 @@ prefs_themes_refresh(void)
/* refresh the list of themes in the manager */
purple_theme_manager_refresh();
- tmp = g_build_filename(DATADIR, "icons", "hicolor", "32x32", "apps", "pidgin.png", NULL);
+ tmp = g_build_filename(PURPLE_DATADIR, "icons", "hicolor", "32x32", "apps", "pidgin.png", NULL);
pixbuf = gdk_pixbuf_new_from_file_at_scale(tmp, PREFS_OPTIMAL_ICON_SIZE, PREFS_OPTIMAL_ICON_SIZE, TRUE, NULL);
g_free(tmp);
============================================================
--- pidgin/gtksound.c 10327a09932767eefc929652298735ff6fe85661
+++ pidgin/gtksound.c 6f282220224f90f651ab4539ea254da79a06ea17
@@ -613,7 +613,7 @@ pidgin_sound_play_event(PurpleSoundEvent
g_free(filename);
/* XXX Consider creating a constant for "sounds/purple" to be shared with Finch */
- filename = g_build_filename(DATADIR, "sounds", "purple", sounds[event].def, NULL);
+ filename = g_build_filename(PURPLE_DATADIR, "sounds", "purple", sounds[event].def, NULL);
}
purple_sound_play_file(filename, NULL);
============================================================
--- libpurple/plugins/ssl/Makefile.am faa120ab6d7e09915748523039b5c5d517f01fa2
+++ libpurple/plugins/ssl/Makefile.am aa08541a7dcd034dce3f88eacb5961d19f52e801
@@ -46,6 +46,8 @@ AM_CPPFLAGS = \
endif # PLUGINS
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
+ -DLIBDIR=\"$(libdir)/libpurple\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
$(DEBUG_CFLAGS) \
@@ -56,10 +58,6 @@ AM_CPPFLAGS += \
AM_CPPFLAGS += \
-DWIN32_LEAN_AND_MEAN \
-I$(top_srcdir)/libpurple/win32
-else
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)/libpurple\"
endif
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
============================================================
--- pidgin/gtkdialogs.c 1bb8cac181f73fedef2444a42934656cd2883cc2
+++ pidgin/gtkdialogs.c bcea6f5afe8255b1b55a64ddc6e15ded65352017
@@ -423,7 +423,7 @@ pidgin_build_help_dialog(const char *tit
gtk_window_set_default_size(GTK_WINDOW(win), 450, 450);
/* Generate a logo with a version number */
- filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "logo.png", NULL);
+ filename = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "logo.png", NULL);
pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
g_free(filename);
============================================================
--- pidgin/gtkthemes.c ffa9442384081a7ef5f81ebbbb6898c64ce44c46
+++ pidgin/gtkthemes.c 2af9ce5c07013c86be82bed890a0e7f1510fedd0
@@ -375,7 +375,7 @@ void pidgin_themes_smiley_theme_probe()
pidgin_smiley_themes_remove_non_existing();
- probedirs[0] = g_build_filename(DATADIR, "pixmaps", "pidgin", "emotes", NULL);
+ probedirs[0] = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emotes", NULL);
probedirs[1] = g_build_filename(purple_user_dir(), "smileys", NULL);
probedirs[2] = 0;
for (l=0; probedirs[l]; l++) {
============================================================
--- pidgin/pidginstock.c 27d760196319bd34c9099b911489e268beed07f8
+++ pidgin/pidginstock.c db51cddb38eb1508ab807c0ad9bce33e270cf578
@@ -241,7 +241,7 @@ find_file_common(const char *name)
return filename;
g_free(filename);
}
- filename = g_build_filename(DATADIR, name, NULL);
+ filename = g_build_filename(PURPLE_DATADIR, name, NULL);
if (g_file_test(filename, G_FILE_TEST_EXISTS))
return filename;
g_free(filename);
============================================================
--- pidgin/gtkdnd-hints.c 8e45c61fe0d1753f5bb88ef80806da0e716c85d0
+++ pidgin/gtkdnd-hints.c 3af53a08b6da2f57b66c1b4bea915b027045c18a
@@ -121,7 +121,7 @@ dnd_hints_init(void)
for (i = 0; hint_windows[i].filename != NULL; i++) {
gchar *fname;
- fname = g_build_filename(DATADIR, "pixmaps", "pidgin",
+ fname = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin",
hint_windows[i].filename, NULL);
hint_windows[i].widget = dnd_hints_init_window(fname);
============================================================
--- pidgin/gtkmain.c b58661443d35eb2407fcabcd11690e2ccf4daee6
+++ pidgin/gtkmain.c 2e60724b0762acc35eb208d9ff24167a49b0b4dd
@@ -281,7 +281,7 @@ ui_main(void)
#ifndef _WIN32
/* use the nice PNG icon for all the windows */
for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) {
- icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i].dir, "apps", icon_sizes[i].filename, NULL);
+ icon_path = g_build_filename(PURPLE_DATADIR, "icons", "hicolor", icon_sizes[i].dir, "apps", icon_sizes[i].filename, NULL);
icon = gdk_pixbuf_new_from_file(icon_path, NULL);
g_free(icon_path);
if (icon) {
============================================================
--- pidgin/plugins/musicmessaging/Makefile.am dfe30b49b74766e00707cffc6ac50a57bdb446c7
+++ pidgin/plugins/musicmessaging/Makefile.am 97108886e4b386d087e080ba0900ec1c768f409c
@@ -20,12 +20,6 @@ musicmessaging_la_SOURCES = \
musicmessaging_la_SOURCES = \
musicmessaging.c
-if OS_WIN32
-PIDGIN_LIBS = $(top_builddir)/pidgin/.libs/libpidgin.la
-else
-PIDGIN_LIBS =
-endif
-
musicmessaging_la_LIBADD = $(GTK_LIBS) $(DBUS_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS)
CLEANFILES = music-messaging-bindings.c
@@ -45,6 +39,7 @@ AM_CPPFLAGS = \
endif
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/libpurple \
-I$(top_srcdir)/pidgin \
@@ -56,7 +51,4 @@ AM_CPPFLAGS += \
AM_CPPFLAGS += \
-I$(top_srcdir)/libpurple/win32 \
-I$(top_srcdir)/pidgin/win32
-else
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\"
endif
============================================================
--- pidgin/plugins/musicmessaging/musicmessaging.c 478100ddd55fd4d4f7dfaba7ed34be59987e5adb
+++ pidgin/plugins/musicmessaging/musicmessaging.c 45ca0276bfc641873f754c582a06bae4fd249ea8
@@ -597,7 +597,7 @@ static void add_button (MMConversation *
g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(music_button_toggled), mmconv);
- file_path = g_build_filename(DATADIR, "pixmaps", "purple", "buttons",
+ file_path = g_build_filename(PURPLE_DATADIR, "pixmaps", "purple", "buttons",
"music.png", NULL);
image = gtk_image_new_from_file(file_path);
g_free(file_path);
============================================================
--- finch/plugins/Makefile.am da7f8f6cd667cbfb649610c7a379184daa44362b
+++ finch/plugins/Makefile.am 406bf70f505325340c58b4398b1fdd27970c6667
@@ -39,6 +39,7 @@ AM_CPPFLAGS = \
EXTRA_DIST = pietray.py
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/libpurple \
-I$(top_srcdir) \
@@ -48,11 +49,6 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GNT_CFLAGS) \
$(PLUGIN_CFLAGS)
-
-if !OS_WIN32
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\"
-endif
#
# This part allows people to build their own plugins in here.
============================================================
--- finch/Makefile.am eb651bca466814a115519ae52117d7c188777001
+++ finch/Makefile.am cfc891f73c4c9203662444b9b8dfeb14bee3282c
@@ -77,6 +77,10 @@ AM_CPPFLAGS = \
$(top_builddir)/libpurple/libpurple.la
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
+ -DLIBDIR=\"$(libdir)/finch/\" \
+ -DLOCALEDIR=\"$(datadir)/locale\" \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
-DSTANDALONE \
-I$(top_srcdir)/libpurple/ \
-I$(top_srcdir) \
@@ -87,11 +91,3 @@ AM_CPPFLAGS = \
$(LIBXML_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(GNT_CFLAGS)
-
-if !OS_WIN32
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)/finch/\" \
- -DLOCALEDIR=\"$(datadir)/locale\" \
- -DSYSCONFDIR=\"$(sysconfdir)\"
-endif
============================================================
--- libpurple/Makefile.am ebfcc22acc0596ed8951bfd60bc4de826c102bd6
+++ libpurple/Makefile.am 88a33f0f83ceaed776ba7fc81d6442c225482929
@@ -352,6 +352,10 @@ AM_CPPFLAGS = \
endif
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
+ -DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \
+ -DLOCALEDIR=\"$(datadir)/locale\" \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
$(GLIB_CFLAGS) \
$(DEBUG_CFLAGS) \
$(DBUS_CFLAGS) \
@@ -366,12 +370,6 @@ AM_CPPFLAGS += \
AM_CPPFLAGS += \
-DUSE_FHS \
-I$(top_srcdir)/libpurple/win32
-else
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \
- -DLOCALEDIR=\"$(datadir)/locale\" \
- -DSYSCONFDIR=\"$(sysconfdir)\"
endif
# INSTALL_SSL_CERTIFICATES is true when SSL_CERTIFICATES_DIR is empty.
============================================================
--- libpurple/plugins/Makefile.am 42c89ccc5987cca039729da4204180f634a5a514
+++ libpurple/plugins/Makefile.am bfb47288819223514a1a018cd96e45a151f0fdaf
@@ -141,6 +141,7 @@ AM_CPPFLAGS = \
startup.py
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
$(DEBUG_CFLAGS) \
@@ -151,9 +152,6 @@ AM_CPPFLAGS += \
if OS_WIN32
AM_CPPFLAGS += \
-I$(top_srcdir)/libpurple/win32
-else
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\"
endif
#
============================================================
--- pidgin/Makefile.am 839b6308976594e3dd209ccc1a886bfbee6622a4
+++ pidgin/Makefile.am 86c932088b01efdba231c660112f1d2ebc3e5c43
@@ -224,6 +224,10 @@ AM_CPPFLAGS = \
endif
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
+ -DLIBDIR=\"$(libdir)/pidgin/\" \
+ -DLOCALEDIR=\"$(datadir)/locale\" \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/libpurple/ \
-I$(top_builddir) \
@@ -244,12 +248,6 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/libpurple/win32 \
-I$(top_srcdir)/pidgin/win32 \
-I$(top_srcdir)/pidgin/win32/IdleTracker
-else
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)/pidgin/\" \
- -DLOCALEDIR=\"$(datadir)/locale\" \
- -DSYSCONFDIR=\"$(sysconfdir)\"
endif
endif # ENABLE_GTK
============================================================
--- pidgin/plugins/Makefile.am 5a0a64862c7542afd95aca0da0ef5e9b439216aa
+++ pidgin/plugins/Makefile.am 2f43479eb3ca3abfe9026c5e247140e7cedca81b
@@ -111,12 +111,6 @@ endif
themeedit_la_SOURCES = themeedit.c themeedit-icon.c themeedit-icon.h
endif
-if OS_WIN32
-PIDGIN_LIBS = $(top_builddir)/pidgin/.libs/libpidgin.la
-else
-PIDGIN_LIBS =
-endif
-
convcolors_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
contact_priority_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
extplacement_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
@@ -143,6 +137,7 @@ AM_CPPFLAGS = \
raw.c
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/libpurple \
-I$(top_srcdir)/pidgin \
@@ -155,9 +150,6 @@ AM_CPPFLAGS += \
AM_CPPFLAGS += \
-I$(top_srcdir)/libpurple/win32 \
-I$(top_srcdir)/pidgin/win32
-else
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\"
endif
#
============================================================
--- pidgin/plugins/cap/Makefile.am 264a53569d3b3159d2c9240f8519c439a2577e69
+++ pidgin/plugins/cap/Makefile.am 65e073190912545e737a738f6685f27a0f79a425
@@ -18,16 +18,12 @@ AM_CPPFLAGS = \
cap_la_LIBADD = $(GTK_LIBS) $(SQLITE3_LIBS)
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/pidgin \
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS) \
$(SQLITE3_CFLAGS)
-
-if !OS_WIN32
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\"
-endif
EXTRA_DIST = Makefile.mingw
============================================================
--- finch/libgnt/wms/Makefile.am 9f0a8565097b0d4d60a07232c08a57b51739c7d3
+++ finch/libgnt/wms/Makefile.am f7bbf888a4ddf31645687eb762188bf134d081f4
@@ -29,6 +29,7 @@ AM_CPPFLAGS = \
EXTRA_DIST =
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\"
-I$(top_srcdir)/libpurple \
-I$(top_srcdir)/finch \
-I$(top_srcdir)/finch/libgnt \
@@ -36,8 +37,3 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GNT_CFLAGS) \
$(PLUGIN_CFLAGS)
-
-if !OS_WIN32
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\"
-endif
============================================================
--- libpurple/example/Makefile.am d0bcc884e74eacc5280e190c7b67433fbcecb9c4
+++ libpurple/example/Makefile.am 5360d07aa01b1edc21121fcb883786c21eca2d07
@@ -11,6 +11,10 @@ AM_CPPFLAGS = \
$(top_builddir)/libpurple/libpurple.la
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
+ -DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \
+ -DLOCALEDIR=\"$(datadir)/locale\" \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
-DSTANDALONE \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/libpurple \
@@ -20,10 +24,3 @@ AM_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(LIBXML_CFLAGS)
-if !OS_WIN32
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \
- -DLOCALEDIR=\"$(datadir)/locale\" \
- -DSYSCONFDIR=\"$(sysconfdir)\"
-endif
============================================================
--- libpurple/certificate.c a56515894902983212b31418c77a5cca4a8c71d8
+++ libpurple/certificate.c 31ec6cc628aa98440e41822f4363aa5ca543caad
@@ -892,14 +892,14 @@ x509_ca_init(void)
/* Attempt to point at the appropriate system path */
if (NULL == x509_ca_paths) {
#if defined(_WIN32) && !defined(USE_FHS)
- x509_ca_paths = g_list_append(NULL, g_build_filename(DATADIR,
+ x509_ca_paths = g_list_append(NULL, g_build_filename(PURPLE_DATADIR,
"ca-certs", NULL));
#else
# ifdef SSL_CERTIFICATES_DIR
x509_ca_paths = g_list_append(NULL, g_strdup(SSL_CERTIFICATES_DIR));
# endif
x509_ca_paths = g_list_append(x509_ca_paths,
- g_build_filename(DATADIR, "purple", "ca-certs", NULL));
+ g_build_filename(PURPLE_DATADIR, "purple", "ca-certs", NULL));
#endif
}
============================================================
--- finch/gntsound.c 070af872af7fdad26dd93a2f643668828c9299ab
+++ finch/gntsound.c 84107b41566d5109ba485805dd462981fbea6620
@@ -615,7 +615,7 @@ finch_sound_play_event(PurpleSoundEventI
if (!filename || !strlen(filename)) {
g_free(filename);
/* XXX Consider creating a constant for "sounds/purple" to be shared with Pidgin */
- filename = g_build_filename(DATADIR, "sounds", "purple", sounds[event].def, NULL);
+ filename = g_build_filename(PURPLE_DATADIR, "sounds", "purple", sounds[event].def, NULL);
}
purple_sound_play_file(filename, NULL);
============================================================
--- pidgin/plugins/gevolution/Makefile.am 1f07a59d56ad67e5424b86e8687a337bcc9e300a
+++ pidgin/plugins/gevolution/Makefile.am be2c694b52d6f2ab189d0c2882e454ccfcd7040d
@@ -19,25 +19,15 @@ gevolution_la_SOURCES = \
new_person_dialog.c \
eds-utils.c
-if OS_WIN32
-PIDGIN_LIBS = $(top_builddir)/pidgin/.libs/libpidgin.la
-else
-PIDGIN_LIBS =
-endif
-
gevolution_la_LIBADD = $(EVOLUTION_ADDRESSBOOK_LIBS) $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS)
endif
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/pidgin \
$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS)
-
-if !OS_WIN32
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\"
-endif
============================================================
--- pidgin/plugins/disco/gtkdisco.c b31dab5b2ef8b0a1647f6964af85b514f99dcd5a
+++ pidgin/plugins/disco/gtkdisco.c 423762b47f5f2c459b0a3b9a7ece5b3b619edcdb
@@ -119,14 +119,14 @@ pidgin_disco_load_icon(XmppDiscoService
if (service->type == XMPP_DISCO_SERVICE_TYPE_GATEWAY && service->gateway_type) {
char *tmp = g_strconcat(service->gateway_type, ".png", NULL);
- filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", size, tmp, NULL);
+ filename = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "protocols", size, tmp, NULL);
g_free(tmp);
#if 0
} else if (service->type == XMPP_DISCO_SERVICE_TYPE_USER) {
- filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", size, "person.png", NULL);
+ filename = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "status", size, "person.png", NULL);
#endif
} else if (service->type == XMPP_DISCO_SERVICE_TYPE_CHAT)
- filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", size, "chat.png", NULL);
+ filename = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "status", size, "chat.png", NULL);
if (filename) {
pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
============================================================
--- pidgin/plugins/disco/Makefile.am 8b17cdccd7bee286b3b1710207fbbaf6cdce2038
+++ pidgin/plugins/disco/Makefile.am 5c0af432d01b539050904ff65b5efe7b86b4e828
@@ -19,17 +19,12 @@ xmppdisco_la_SOURCES = \
xmppdisco.c \
xmppdisco.h
-if OS_WIN32
-PIDGIN_LIBS = $(top_builddir)/pidgin/.libs/libpidgin.la
-else
-PIDGIN_LIBS =
-endif
-
xmppdisco_la_LIBADD = $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS)
endif
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/pidgin \
@@ -40,8 +35,5 @@ AM_CPPFLAGS += \
AM_CPPFLAGS += \
-I$(top_srcdir)/libpurple/win32 \
-I$(top_srcdir)/pidgin/win32
-else
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\"
endif
============================================================
--- pidgin/gtkdocklet-gtk.c cad88b2542a67d03d047f8e16cdb47c071665590
+++ pidgin/gtkdocklet-gtk.c 8e568c0865057d6d5cd6439c530d73db2fd23bc4
@@ -164,5 +164,5 @@ docklet_ui_init(void)
{
pidgin_docklet_set_ui_ops(&ui_ops);
gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
- DATADIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "pidgin" G_DIR_SEPARATOR_S "tray");
+ PURPLE_DATADIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "pidgin" G_DIR_SEPARATOR_S "tray");
}
============================================================
--- pidgin/plugins/win32/transparency/Makefile.am 74f22b7a2d93e78e003838179e1884aac89cf3be
+++ pidgin/plugins/win32/transparency/Makefile.am 41fcbb91133f77d7c9d2510a4250fb435b18951c
@@ -14,27 +14,18 @@ win2ktrans_la_SOURCES = \
win2ktrans_la_SOURCES = \
win2ktrans.c
-PURPLE_LIBS = $(top_builddir)/libpurple/libpurple.la
-PIDGIN_LIBS = $(top_builddir)/pidgin/.libs/libpidgin.la
-
win2ktrans_la_LIBADD = $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS)
endif
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/pidgin \
+ -I$(top_srcdir)/libpurple/win32 \
+ -I$(top_srcdir)/pidgin/win32 \
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS)
-if OS_WIN32
-AM_CPPFLAGS += \
- -I$(top_srcdir)/libpurple/win32 \
- -I$(top_srcdir)/pidgin/win32
-else
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\"
endif
-
-endif
============================================================
--- pidgin/plugins/win32/winprefs/Makefile.am 683a925136989478d91e6152ca2c98a7210edcd3
+++ pidgin/plugins/win32/winprefs/Makefile.am 729b95e89117cc60c67729cbc488af8f2e865ce5
@@ -18,27 +18,18 @@ winprefs_la_SOURCES = \
gtkappbar.h \
winprefs.c
-PURPLE_LIBS = $(top_builddir)/libpurple/libpurple.la
-PIDGIN_LIBS = $(top_builddir)/pidgin/.libs/libpidgin.la
-
winprefs_la_LIBADD = $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS)
endif
AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/pidgin \
+ -I$(top_srcdir)/libpurple/win32 \
+ -I$(top_srcdir)/pidgin/win32 \
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS)
-if OS_WIN32
-AM_CPPFLAGS += \
- -I$(top_srcdir)/libpurple/win32 \
- -I$(top_srcdir)/pidgin/win32
-else
-AM_CPPFLAGS += \
- -DDATADIR=\"$(datadir)\"
endif
-
-endif
More information about the Commits
mailing list