/soc/2013/ankitkv/gobjectification: 8bc56580f70e: Updated the pr...
Ankit Vani
a at nevitus.org
Sun Sep 22 13:22:32 EDT 2013
Changeset: 8bc56580f70e0fa959d3d13f5b08f55fb6e817fb
Author: Ankit Vani <a at nevitus.org>
Date: 2013-09-22 22:45 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/8bc56580f70e
Description:
Updated the protocol makefiles for windows
diffstat:
libpurple/protocols/jabber/Makefile.mingw | 40 ++++++------------------------
libpurple/protocols/mxit/Makefile.mingw | 2 +-
libpurple/protocols/oscar/Makefile.mingw | 29 +++++-----------------
libpurple/protocols/yahoo/Makefile.mingw | 35 +++++++-------------------
4 files changed, 26 insertions(+), 80 deletions(-)
diffs (265 lines):
diff --git a/libpurple/protocols/jabber/Makefile.mingw b/libpurple/protocols/jabber/Makefile.mingw
--- a/libpurple/protocols/jabber/Makefile.mingw
+++ b/libpurple/protocols/jabber/Makefile.mingw
@@ -8,9 +8,6 @@ PIDGIN_TREE_TOP := ../../..
include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
TARGET = libjabber
-FACEBOOK_TARGET = libfacebook
-GTALK_TARGET = libgtalk
-XMPP_TARGET = libxmpp
TYPE = PLUGIN
# Static or Plugin...
@@ -65,6 +62,7 @@ C_SRC = \
chat.c \
data.c \
disco.c \
+ facebook.c \
google/gmail.c \
google/google.c \
google/google_presence.c \
@@ -72,6 +70,7 @@ C_SRC = \
google/google_session.c \
google/jingleinfo.c \
google/relay.c \
+ gtalk.c \
ibb.c \
iq.c \
jabber.c \
@@ -96,20 +95,12 @@ C_SRC = \
usernick.c \
usertune.c \
xdata.c \
+ xmpp.c \
win32/posix.uname.c \
$(VV_SRC)
OBJECTS = $(C_SRC:%.c=%.o)
-FACEBOOK_C_SRC = libfacebook.c
-FACEBOOK_OBJECTS = $(FACEBOOK_C_SRC:%.c=%.o)
-
-GTALK_C_SRC = libgtalk.c
-GTALK_OBJECTS = $(GTALK_C_SRC:%.c=%.o)
-
-XMPP_C_SRC = libxmpp.c
-XMPP_OBJECTS = $(XMPP_C_SRC:%.c=%.o)
-
##
## LIBRARIES
##
@@ -135,35 +126,20 @@ include $(PIDGIN_COMMON_RULES)
##
.PHONY: all install clean
-all: $(TARGET).dll $(FACEBOOK_TARGET).dll $(GTALK_TARGET).dll $(XMPP_TARGET).dll
+all: $(TARGET).dll
install: all $(DLL_INSTALL_DIR)
- cp $(FACEBOOK_TARGET).dll $(DLL_INSTALL_DIR)
- cp $(GTALK_TARGET).dll $(DLL_INSTALL_DIR)
- cp $(XMPP_TARGET).dll $(DLL_INSTALL_DIR)
- cp $(TARGET).dll $(PURPLE_INSTALL_DIR)
+ cp $(TARGET).dll $(DLL_INSTALL_DIR)
$(OBJECTS): $(PURPLE_CONFIG_H)
-$(TARGET).dll $(TARGET).dll.a: $(PURPLE_DLL).a $(OBJECTS)
- $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
-
-$(FACEBOOK_TARGET).dll: $(TARGET).dll.a $(FACEBOOK_OBJECTS)
- $(CC) -shared $(FACEBOOK_OBJECTS) $(LIB_PATHS) $(LIBS) -ljabber $(DLL_LD_FLAGS) -o $(FACEBOOK_TARGET).dll
-
-$(GTALK_TARGET).dll: $(TARGET).dll.a $(GTALK_OBJECTS)
- $(CC) -shared $(GTALK_OBJECTS) $(LIB_PATHS) $(LIBS) -ljabber $(DLL_LD_FLAGS) -o $(GTALK_TARGET).dll
-
-$(XMPP_TARGET).dll: $(TARGET).dll.a $(XMPP_OBJECTS)
- $(CC) -shared $(XMPP_OBJECTS) $(LIB_PATHS) $(LIBS) -ljabber $(DLL_LD_FLAGS) -o $(XMPP_TARGET).dll
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
+ $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
##
## CLEAN RULES
##
clean:
- rm -f $(OBJECTS) $(TARGET).dll $(TARGET).dll.a
- rm -f $(FACEBOOK_OBJECTS) $(FACEBOOK_TARGET).dll
- rm -f $(GTALK_OBJECTS) $(GTALK_TARGET).dll
- rm -f $(XMPP_OBJECTS) $(XMPP_TARGET).dll
+ rm -f $(OBJECTS) $(TARGET).dll
include $(PIDGIN_COMMON_TARGETS)
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
@@ -41,6 +41,7 @@ C_SRC = actions.c \
aes.c \
chunk.c \
cipher.c \
+ client.c \
filexfer.c \
formcmds.c \
login.c \
@@ -48,7 +49,6 @@ C_SRC = actions.c \
multimx.c \
mxit.c \
profile.c \
- protocol.c \
roster.c \
splashscreen.c \
voicevideo.c
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
@@ -8,8 +8,6 @@ PIDGIN_TREE_TOP := ../../..
include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
TARGET = liboscar
-AIM_TARGET = libaim
-ICQ_TARGET = libicq
TYPE = PLUGIN
# Static or Plugin...
@@ -41,6 +39,7 @@ LIB_PATHS += -L$(GTK_TOP)/lib \
## SOURCES, OBJECTS
##
C_SRC = \
+ aim.c \
authorization.c \
bstream.c \
clientlogin.c \
@@ -62,6 +61,7 @@ C_SRC = \
family_stats.c \
family_userlookup.c \
flap_connection.c \
+ icq.c \
misc.c \
msgcookie.c \
odc.c \
@@ -79,12 +79,6 @@ C_SRC = \
OBJECTS = $(C_SRC:%.c=%.o)
-AIM_C_SRC = libaim.c
-AIM_OBJECTS = $(AIM_C_SRC:%.c=%.o)
-
-ICQ_C_SRC = libicq.c
-ICQ_OBJECTS = $(ICQ_C_SRC:%.c=%.o)
-
##
## LIBRARIES
##
@@ -101,29 +95,20 @@ include $(PIDGIN_COMMON_RULES)
##
.PHONY: all install clean
-all: $(TARGET).dll $(AIM_TARGET).dll $(ICQ_TARGET).dll
+all: $(TARGET).dll
install: all $(DLL_INSTALL_DIR)
- cp $(AIM_TARGET).dll $(ICQ_TARGET).dll $(DLL_INSTALL_DIR)
- cp $(TARGET).dll $(PURPLE_INSTALL_DIR)
+ cp $(TARGET).dll $(DLL_INSTALL_DIR)
$(OBJECTS): $(PURPLE_CONFIG_H)
-$(TARGET).dll.a $(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
- $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
-
-$(AIM_TARGET).dll: $(TARGET).dll.a $(AIM_OBJECTS)
- $(CC) -shared $(AIM_OBJECTS) $(LIB_PATHS) $(LIBS) -loscar $(DLL_LD_FLAGS) -o $(AIM_TARGET).dll
-
-$(ICQ_TARGET).dll: $(TARGET).dll.a $(ICQ_OBJECTS)
- $(CC) -shared $(ICQ_OBJECTS) $(LIB_PATHS) $(LIBS) -loscar $(DLL_LD_FLAGS) -o $(ICQ_TARGET).dll
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
+ $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
##
## CLEAN RULES
##
clean:
- rm -f $(OBJECTS) $(TARGET).dll $(TARGET).dll.a
- rm -f $(AIM_OBJECTS) $(AIM_TARGET).dll
- rm -f $(ICQ_OBJECTS) $(ICQ_TARGET).dll
+ rm -f $(OBJECTS) $(TARGET).dll
include $(PIDGIN_COMMON_TARGETS)
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
@@ -7,9 +7,7 @@
PIDGIN_TREE_TOP := ../../..
include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
-TARGET = libymsg
-YAHOO_TARGET = libyahoo
-YAHOOJP_TARGET = libyahoojp
+TARGET = libyahoo
TYPE = PLUGIN
# Static or Plugin...
@@ -41,7 +39,8 @@ LIB_PATHS += -L. \
## SOURCES, OBJECTS
##
C_SRC = util.c \
- libymsg.c \
+ yahoo.c \
+ yahoojp.c \
yahoochat.c \
yahoo_aliases.c \
yahoo_doodle.c \
@@ -50,16 +49,11 @@ C_SRC = util.c \
yahoo_packet.c \
yahoo_picture.c \
yahoo_profile.c \
- ycht.c
+ ycht.c \
+ ymsg.c
OBJECTS = $(C_SRC:%.c=%.o)
-YAHOO_C_SRC = libyahoo.c
-YAHOO_OBJECTS = $(YAHOO_C_SRC:%.c=%.o)
-
-YAHOOJP_C_SRC = libyahoojp.c
-YAHOOJP_OBJECTS = $(YAHOOJP_C_SRC:%.c=%.o)
-
##
## LIBRARIES
##
@@ -77,29 +71,20 @@ include $(PIDGIN_COMMON_RULES)
.PHONY: all install clean
-all: $(TARGET).dll $(YAHOO_TARGET).dll $(YAHOOJP_TARGET).dll
+all: $(TARGET).dll
install: all $(DLL_INSTALL_DIR)
- cp $(YAHOO_TARGET).dll $(YAHOOJP_TARGET).dll $(DLL_INSTALL_DIR)
- cp $(TARGET).dll $(PURPLE_INSTALL_DIR)
+ cp $(TARGET).dll $(DLL_INSTALL_DIR)
$(OBJECTS): $(PURPLE_CONFIG_H)
-$(TARGET).dll.a $(TARGET).dll: $(PURPLE_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
-
-$(YAHOO_TARGET).dll: $(TARGET).dll.a $(YAHOO_OBJECTS)
- $(CC) -shared $(YAHOO_OBJECTS) $(LIB_PATHS) $(LIBS) -lymsg $(DLL_LD_FLAGS) -o $(YAHOO_TARGET).dll
-
-$(YAHOOJP_TARGET).dll: $(TARGET).dll.a $(YAHOOJP_OBJECTS)
- $(CC) -shared $(YAHOOJP_OBJECTS) $(LIB_PATHS) $(LIBS) -lymsg $(DLL_LD_FLAGS) -o $(YAHOOJP_TARGET).dll
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
+ $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
##
## CLEAN RULES
##
clean:
- rm -f $(OBJECTS) $(TARGET).dll $(TARGET).dll.a
- rm -f $(YAHOO_OBJECTS) $(YAHOO_TARGET).dll
- rm -f $(YAHOOJP_OBJECTS) $(YAHOOJP_TARGET).dll
+ rm -f $(OBJECTS) $(TARGET).dll
include $(PIDGIN_COMMON_TARGETS)
More information about the Commits
mailing list