/soc/2013/ankitkv/gobjectification: fa4d47377827: win32: fixed m...
Ankit Vani
a at nevitus.org
Sun Sep 29 07:25:40 EDT 2013
Changeset: fa4d473778274ad338e588369a55952426e16977
Author: Ankit Vani <a at nevitus.org>
Date: 2013-09-29 16:33 +0530
Branch: soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/fa4d47377827
Description:
win32: fixed makefiles
diffstat:
libpurple/Makefile.mingw | 28 ++++++++++++++++++++++------
libpurple/plugins/keyrings/Makefile.mingw | 1 +
libpurple/plugins/perl/common/Makefile.mingw | 3 ++-
libpurple/plugins/ssl/Makefile.mingw | 1 +
libpurple/plugins/tcl/Makefile.mingw | 1 +
libpurple/protocols/bonjour/Makefile.mingw | 1 +
libpurple/protocols/irc/Makefile.mingw | 1 +
libpurple/protocols/msn/Makefile.mingw | 1 +
libpurple/protocols/mxit/Makefile.mingw | 1 +
libpurple/protocols/myspace/Makefile.mingw | 1 +
libpurple/protocols/novell/Makefile.mingw | 1 +
libpurple/protocols/null/Makefile.mingw | 1 +
libpurple/protocols/oscar/Makefile.mingw | 1 +
libpurple/protocols/sametime/Makefile.mingw | 1 +
libpurple/protocols/silc/Makefile.mingw | 1 +
libpurple/protocols/simple/Makefile.mingw | 1 +
libpurple/protocols/yahoo/Makefile.mingw | 1 +
libpurple/protocols/zephyr/Makefile.mingw | 1 +
libpurple/win32/global.mak | 1 +
19 files changed, 41 insertions(+), 7 deletions(-)
diffs (264 lines):
diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -53,13 +53,15 @@ ifeq "$(USE_VV)" "1"
VV_SRC = \
media/backend-fs2.c \
media/backend-iface.c \
- media/codec.c \
- marshallers.c
+ media/codec.c
else
VV_SRC =
endif
+BUILT_SRC = marshallers.c enums.c
+
C_SRC = \
+ $(BUILT_SRC) \
account.c \
accounts.c \
accountopt.c \
@@ -142,6 +144,16 @@ C_SRC = \
RC_SRC = win32/libpurplerc.rc
+ENUM_HEADERS = \
+ account.h \
+ cipher.h \
+ connection.h \
+ conversation.h \
+ conversationtypes.h \
+ roomlist.h \
+ status.h \
+ xfer.h
+
OBJECTS = $(C_SRC:%.c=%.o) $(RC_SRC:%.rc=%.o)
##
@@ -202,9 +214,13 @@ marshallers.c: marshallers.list marshall
@echo "#include \"marshallers.h\"" > marshallers.c
@$(GLIB_GENMARSHAL) --prefix=purple_smarshal $< --body >> marshallers.c
-ifeq "$(USE_VV)" "1"
-mediamanager.c media/backend-iface.c: marshallers.h
-endif
+enums.h: enums.h.template $(ENUM_HEADERS)
+ @echo -e " GEN\t$@"
+ @$(GLIB_MKENUMS) --template enums.h.template $(ENUM_HEADERS) > enums.h
+
+enums.c: enums.c.template enums.h $(ENUM_HEADERS)
+ @echo -e " GEN\t$@"
+ @$(GLIB_MKENUMS) --template enums.c.template $(ENUM_HEADERS) > enums.c
$(TARGET).dll $(TARGET).dll.a: $(OBJECTS)
$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(TARGET).def,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
@@ -213,7 +229,7 @@ endif
## CLEAN RULES
##
clean:
- rm -f $(OBJECTS) $(RC_SRC) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H) marshallers.h marshallers.c
+ rm -f $(OBJECTS) $(RC_SRC) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H) marshallers.h marshallers.c enums.h enums.c
rm -f $(TARGET).dll $(TARGET).dll.a $(TARGET).def
$(MAKE_at) $(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE) clean
$(MAKE_at) $(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
diff --git a/libpurple/plugins/keyrings/Makefile.mingw b/libpurple/plugins/keyrings/Makefile.mingw
--- a/libpurple/plugins/keyrings/Makefile.mingw
+++ b/libpurple/plugins/keyrings/Makefile.mingw
@@ -43,6 +43,7 @@ OBJECTS_WINCRED = $(C_SRC_WINCRED:%.c=%.
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lws2_32 \
-lintl \
-lpurple
diff --git a/libpurple/plugins/perl/common/Makefile.mingw b/libpurple/plugins/perl/common/Makefile.mingw
--- a/libpurple/plugins/perl/common/Makefile.mingw
+++ b/libpurple/plugins/perl/common/Makefile.mingw
@@ -86,7 +86,8 @@ OBJECTS = $(C_FILES:%.c=%.o)
LIBS = -lperl510 \
-lperl \
-lpurple \
- -lglib-2.0
+ -lglib-2.0 \
+ -lgobject-2.0
include $(PIDGIN_COMMON_RULES)
diff --git a/libpurple/plugins/ssl/Makefile.mingw b/libpurple/plugins/ssl/Makefile.mingw
--- a/libpurple/plugins/ssl/Makefile.mingw
+++ b/libpurple/plugins/ssl/Makefile.mingw
@@ -49,6 +49,7 @@ OBJECTS_GNUTLS = $(C_SRC_GNUTLS:%.c=%.o)
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lws2_32 \
-lintl \
-lpurple \
diff --git a/libpurple/plugins/tcl/Makefile.mingw b/libpurple/plugins/tcl/Makefile.mingw
--- a/libpurple/plugins/tcl/Makefile.mingw
+++ b/libpurple/plugins/tcl/Makefile.mingw
@@ -44,6 +44,7 @@ OBJECTS = $(C_SRC:%.c=%.o)
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lws2_32 \
-lintl \
-lpurple \
diff --git a/libpurple/protocols/bonjour/Makefile.mingw b/libpurple/protocols/bonjour/Makefile.mingw
--- a/libpurple/protocols/bonjour/Makefile.mingw
+++ b/libpurple/protocols/bonjour/Makefile.mingw
@@ -58,6 +58,7 @@ OBJECTS = $(C_SRC:%.c=%.o)
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lws2_32 \
-lintl \
-lnetapi32 \
diff --git a/libpurple/protocols/irc/Makefile.mingw b/libpurple/protocols/irc/Makefile.mingw
--- a/libpurple/protocols/irc/Makefile.mingw
+++ b/libpurple/protocols/irc/Makefile.mingw
@@ -50,6 +50,7 @@ OBJECTS = $(C_SRC:%.c=%.o)
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lws2_32 \
-lintl \
-lpurple
diff --git a/libpurple/protocols/msn/Makefile.mingw b/libpurple/protocols/msn/Makefile.mingw
--- a/libpurple/protocols/msn/Makefile.mingw
+++ b/libpurple/protocols/msn/Makefile.mingw
@@ -79,6 +79,7 @@ OBJECTS = $(C_SRC:%.c=%.o)
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lintl \
-lws2_32 \
-lpurple
diff --git a/libpurple/protocols/mxit/Makefile.mingw b/libpurple/protocols/mxit/Makefile.mingw
--- a/libpurple/protocols/mxit/Makefile.mingw
+++ b/libpurple/protocols/mxit/Makefile.mingw
@@ -60,6 +60,7 @@ OBJECTS = $(C_SRC:%.c=%.o)
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lintl \
-lws2_32 \
-lpurple
diff --git a/libpurple/protocols/myspace/Makefile.mingw b/libpurple/protocols/myspace/Makefile.mingw
--- a/libpurple/protocols/myspace/Makefile.mingw
+++ b/libpurple/protocols/myspace/Makefile.mingw
@@ -46,6 +46,7 @@ OBJECTS = $(C_SRC:%.c=%.o)
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lws2_32 \
-lintl \
-lpurple
diff --git a/libpurple/protocols/novell/Makefile.mingw b/libpurple/protocols/novell/Makefile.mingw
--- a/libpurple/protocols/novell/Makefile.mingw
+++ b/libpurple/protocols/novell/Makefile.mingw
@@ -57,6 +57,7 @@ OBJECTS = $(C_SRC:%.c=%.o)
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lws2_32 \
-lintl \
-lpurple
diff --git a/libpurple/protocols/null/Makefile.mingw b/libpurple/protocols/null/Makefile.mingw
--- a/libpurple/protocols/null/Makefile.mingw
+++ b/libpurple/protocols/null/Makefile.mingw
@@ -46,6 +46,7 @@ OBJECTS = $(C_SRC:%.c=%.o)
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lintl \
-lws2_32 \
-lpurple
diff --git a/libpurple/protocols/oscar/Makefile.mingw b/libpurple/protocols/oscar/Makefile.mingw
--- a/libpurple/protocols/oscar/Makefile.mingw
+++ b/libpurple/protocols/oscar/Makefile.mingw
@@ -90,6 +90,7 @@ ICQ_OBJECTS = $(ICQ_C_SRC:%.c=%.o)
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lintl \
-lws2_32 \
-lpurple
diff --git a/libpurple/protocols/sametime/Makefile.mingw b/libpurple/protocols/sametime/Makefile.mingw
--- a/libpurple/protocols/sametime/Makefile.mingw
+++ b/libpurple/protocols/sametime/Makefile.mingw
@@ -50,6 +50,7 @@ OBJECTS = $(C_SRC:%.c=%.o)
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lintl \
-lws2_32 \
-lmeanwhile \
diff --git a/libpurple/protocols/silc/Makefile.mingw b/libpurple/protocols/silc/Makefile.mingw
--- a/libpurple/protocols/silc/Makefile.mingw
+++ b/libpurple/protocols/silc/Makefile.mingw
@@ -57,6 +57,7 @@ OBJECTS = $(C_SRC:%.c=%.o)
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lws2_32 \
-lintl \
-lpurple \
diff --git a/libpurple/protocols/simple/Makefile.mingw b/libpurple/protocols/simple/Makefile.mingw
--- a/libpurple/protocols/simple/Makefile.mingw
+++ b/libpurple/protocols/simple/Makefile.mingw
@@ -47,6 +47,7 @@ OBJECTS = $(C_SRC:%.c=%.o)
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lws2_32 \
-lintl \
-lpurple
diff --git a/libpurple/protocols/yahoo/Makefile.mingw b/libpurple/protocols/yahoo/Makefile.mingw
--- a/libpurple/protocols/yahoo/Makefile.mingw
+++ b/libpurple/protocols/yahoo/Makefile.mingw
@@ -65,6 +65,7 @@ YAHOOJP_OBJECTS = $(YAHOOJP_C_SRC:%.c=%.
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lws2_32 \
-lintl \
-lpurple
diff --git a/libpurple/protocols/zephyr/Makefile.mingw b/libpurple/protocols/zephyr/Makefile.mingw
--- a/libpurple/protocols/zephyr/Makefile.mingw
+++ b/libpurple/protocols/zephyr/Makefile.mingw
@@ -114,6 +114,7 @@ OBJECTS = $(C_SRC:%.c=%.o)
##
LIBS = \
-lglib-2.0 \
+ -lgobject-2.0 \
-lws2_32 \
-lintl \
-lpurple
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -122,6 +122,7 @@ INTLTOOL_MERGE ?= $(INTLTOOL_TOP)/bin/in
MONO_SIGNCODE ?= signcode
GPG_SIGN ?= gpg
GLIB_GENMARSHAL ?= $(GTK_BIN)/glib-genmarshal
+GLIB_MKENUMS ?= $(GTK_BIN)/glib-mkenums
PIDGIN_COMMON_RULES := $(PURPLE_TOP)/win32/rules.mak
PIDGIN_COMMON_TARGETS := $(PURPLE_TOP)/win32/targets.mak
More information about the Commits
mailing list