--- a/libpurple/protocols/irc/Makefile.mingw Mon Apr 09 22:54:39 2007 +0000 +++ b/libpurple/protocols/irc/Makefile.mingw Tue Apr 10 06:19:29 2007 +0000 @@ -4,8 +4,8 @@ # Description: Makefile for win32 (mingw) version of libirc # -GAIM_TOP := ../../.. -include $(GAIM_TOP)/libpurple/win32/global.mak +PIDGIN_TREE_TOP := ../../.. +include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak TARGET = libirc TYPE = PLUGIN @@ -13,10 +13,10 @@ # Static or Plugin... ifeq ($(TYPE),STATIC) DEFINES += -DSTATIC - DLL_INSTALL_DIR = $(GAIM_INSTALL_DIR) + DLL_INSTALL_DIR = $(PURPLE_INSTALL_DIR) else ifeq ($(TYPE),PLUGIN) - DLL_INSTALL_DIR = $(GAIM_INSTALL_PLUGINS_DIR) + DLL_INSTALL_DIR = $(PURPLE_INSTALL_PLUGINS_DIR) endif endif @@ -27,12 +27,12 @@ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/lib/glib-2.0/include \ - -I$(GAIM_LIB_TOP) \ - -I$(GAIM_LIB_TOP)/win32 \ - -I$(GAIM_TOP) + -I$(PURPLE_TOP) \ + -I$(PURPLE_TOP)/win32 \ + -I$(PIDGIN_TREE_TOP) LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(GAIM_LIB_TOP) + -L$(PURPLE_TOP) ## ## SOURCES, OBJECTS @@ -54,7 +54,7 @@ -lintl \ -lpurple -include $(GAIM_COMMON_RULES) +include $(PIDGIN_COMMON_RULES) ## ## TARGET DEFINITIONS @@ -66,12 +66,12 @@ install: all $(DLL_INSTALL_DIR) cp $(TARGET).dll $(DLL_INSTALL_DIR) -$(OBJECTS): $(GAIM_CONFIG_H) +$(OBJECTS): $(PURPLE_CONFIG_H) ## ## BUILD DLL ## -$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS) +$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS) $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll ## @@ -82,4 +82,4 @@ rm -f $(OBJECTS) rm -f $(TARGET).dll -include $(GAIM_COMMON_TARGETS) +include $(PIDGIN_COMMON_TARGETS)