Mercurial > pidgin.yaz
view libpurple/protocols/oscar/Makefile.mingw @ 30865:1cdae196aac8
Standardize on "cancelled".
QuLogic: so, canceled or cancelled? that patch on #12130 is pretty thorough...
wabz: cancelled :D
wabz: that cancelled thing actually bothered me in the past
wabz: never quite enough to do such a patch :p
elb: that's an en_US vs en_GB thing
elb: both are correct, but canceled is more common in en_{US,CA} and cancelled in en_{GB,AU,NZ,etc.}
elb: personally, I use cancelled
QuLogic: yea, that's what I went for before, but I think I couldn't change any strings because we were frozen
QuLogic: you all had to pick the spelling that was opposite from the guy's patch, didn't you...
rekkanoryo: well, considering we're generally en_US in our strings, it should be canceled in our source
elb: considering they're both correct, and while I'm anal retentive, I'm not anal retentive about that, I have no preference ;-)
rekkanoryo: I don't really care either way, I just think that we should be consistently en_US or en_GB throughout
elb: right
elb: my point is, they're both correct for en_US
elb: one 'l' is simply more common
rekkanoryo: ah
rekkanoryo: if they're both technically correct for en_US, then "cancelled" is my vote
rekkanoryo: one 'l' always looks wrong to me
elb: the dictionary claims they are
Sorry, dwc.
Closes #12130.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 23 Aug 2010 01:41:31 +0000 |
parents | d14ad586601c |
children |
line wrap: on
line source
# # Makefile.mingw # # Description: Makefile for win32 (mingw) version of liboscar # PIDGIN_TREE_TOP := ../../.. include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak TARGET = liboscar AIM_TARGET = libaim ICQ_TARGET = libicq TYPE = PLUGIN # Static or Plugin... ifeq ($(TYPE),STATIC) DEFINES += -DSTATIC DLL_INSTALL_DIR = $(PURPLE_INSTALL_DIR) else ifeq ($(TYPE),PLUGIN) DLL_INSTALL_DIR = $(PURPLE_INSTALL_PLUGINS_DIR) endif endif ## ## INCLUDE PATHS ## INCLUDE_PATHS += -I. \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/lib/glib-2.0/include \ -I$(PURPLE_TOP) \ -I$(PURPLE_TOP)/win32 \ -I$(PIDGIN_TREE_TOP) LIB_PATHS += -L$(GTK_TOP)/lib \ -L$(PURPLE_TOP) \ -L. ## ## SOURCES, OBJECTS ## C_SRC = \ authorization.c \ bstream.c \ clientlogin.c \ encoding.c \ family_admin.c \ family_alert.c \ family_auth.c \ family_bart.c \ family_bos.c \ family_buddy.c \ family_chat.c \ family_chatnav.c \ family_feedbag.c \ family_icbm.c \ family_icq.c \ family_locate.c \ family_oservice.c \ family_popup.c \ family_stats.c \ family_userlookup.c \ flap_connection.c \ misc.c \ msgcookie.c \ odc.c \ oft.c \ oscar.c \ oscar_data.c \ peer.c \ peer_proxy.c \ rxhandlers.c \ snac.c \ tlv.c \ userinfo.c \ util.c \ visibility.c 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 ## LIBS = \ -lglib-2.0 \ -lintl \ -lws2_32 \ -lpurple include $(PIDGIN_COMMON_RULES) ## ## TARGET DEFINITIONS ## .PHONY: all install clean all: $(TARGET).dll $(AIM_TARGET).dll $(ICQ_TARGET).dll install: all $(DLL_INSTALL_DIR) cp $(AIM_TARGET).dll $(ICQ_TARGET).dll $(DLL_INSTALL_DIR) cp $(TARGET).dll $(PURPLE_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 ## ## 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 include $(PIDGIN_COMMON_TARGETS)