Mercurial > pidgin.yaz
changeset 10201:5e1ca11db043
[gaim-migrate @ 11319]
silc added
committer: Tailor Script <tailor@pidgin.im>
| author | Herman Bloggs <hermanator12002@yahoo.com> |
|---|---|
| date | Wed, 17 Nov 2004 23:08:24 +0000 |
| parents | f086269582b1 |
| children | ddf002ce58b6 |
| files | Makefile.mingw src/protocols/silc/Makefile.mingw |
| diffstat | 2 files changed, 18 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.mingw Wed Nov 17 05:57:29 2004 +0000 +++ b/Makefile.mingw Wed Nov 17 23:08:24 2004 +0000 @@ -24,6 +24,7 @@ TREPIA = $(GAIM_PROTOS)/trepia GG = $(GAIM_PROTOS)/gg NOVELL = $(GAIM_PROTOS)/novell +SILC = $(GAIM_PROTOS)/silc PO = ./po VERSION := $(shell cat ./VERSION) @@ -31,7 +32,7 @@ NEEDED_DLLS = $(GTKSPELL_TOP)/libgtkspell.dll \ $(IDLETRACK_TOP)/idletrack.dll -SOUNDS = $(GAIM_SOUNDS)/alert.wav \ +SOUNDS = $(GAIM_SOUNDS)/alert.wav \ $(GAIM_SOUNDS)/login.wav \ $(GAIM_SOUNDS)/logout.wav \ $(GAIM_SOUNDS)/receive.wav \ @@ -53,6 +54,7 @@ GG_TYPE = PLUGIN NOVELL_TYPE = PLUGIN TREPIA_TYPE = PLUGIN +SILC_TYPE = PLUGIN all: cp config.h.mingw config.h @@ -64,6 +66,7 @@ $(MAKE) TYPE='$(NAPSTER_TYPE)' -C $(NAPSTER) -f Makefile.mingw $(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw $(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw + $(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw $(MAKE) -C $(GAIM_SRC) -f Makefile.mingw $(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw @@ -83,6 +86,7 @@ $(MAKE) TYPE='$(NAPSTER_TYPE)' -C $(NAPSTER) -f Makefile.mingw install $(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw install $(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw install + $(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw install cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR) cp $(SOUNDS) $(GAIM_INSTALL_DIR)/sounds/gaim @@ -108,6 +112,7 @@ $(MAKE) -C $(NAPSTER) -f Makefile.mingw clean $(MAKE) -C $(GG) -f Makefile.mingw clean $(MAKE) -C $(NOVELL) -f Makefile.mingw clean + $(MAKE) -C $(SILC) -f Makefile.mingw clean $(MAKE) -C $(GAIM_SRC) -f Makefile.mingw clean $(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw clean rm -rf config.h $(GAIM_INSTALL_DIR)
--- a/src/protocols/silc/Makefile.mingw Wed Nov 17 05:57:29 2004 +0000 +++ b/src/protocols/silc/Makefile.mingw Wed Nov 17 23:08:24 2004 +0000 @@ -1,7 +1,7 @@ # # Makefile.mingw # -# Description: Makefile for win32 (mingw) version of libsilcgaim +# Description: Makefile for win32 (mingw) version of libsilc protocol plugin # # @@ -11,18 +11,18 @@ INCLUDE_DIR := . GTK_TOP := ../../../../win32-dev/gtk_2_0 GAIM_TOP := ../../.. -SILC_ROOT := . +SILC_TOP := . GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir -SILC_TOP := ../../../../win32-dev/silc-toolkit-0.9.12 +SILC_TOOLKIT := ../../../../win32-dev/silc-toolkit-0.9.12 ## ## VARIABLE DEFINITIONS ## -TARGET = libsilcgaim +TARGET = libsilc -NEEDED_DLLS = $(SILC_TOP)/win32/libsilc/Release/libsilc.dll \ - $(SILC_TOP)/win32/libsilcclient/Release/libsilcclient.dll +NEEDED_DLLS = $(SILC_TOOLKIT)/lib/silc.dll \ + $(SILC_TOOLKIT)/lib/silcclient.dll # Compiler Options @@ -51,7 +51,7 @@ ## INCLUDE PATHS ## -INCLUDE_PATHS += -I$(SILC_ROOT) \ +INCLUDE_PATHS += -I$(SILC_TOP) \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/gtk-2.0 \ -I$(GTK_TOP)/include/glib-2.0 \ @@ -62,14 +62,12 @@ -I$(GAIM_TOP)/src \ -I$(GAIM_TOP)/src/win32 \ -I$(GAIM_TOP) \ - -I$(SILC_TOP)/win32 \ - -I$(SILC_TOP)/win32/include + -I$(SILC_TOOLKIT)/include LIB_PATHS = -L$(GTK_TOP)/lib \ -L$(GAIM_TOP)/src \ - -L$(SILC_TOP)/win32/libsilc/Release \ - -L$(SILC_TOP)/win32/libsilcclient/Release \ + -L$(SILC_TOOLKIT)/lib ## @@ -100,9 +98,8 @@ -lws2_32 \ -lintl \ -lgaim \ - -llibsilc \ - -llibsilcclient \ - -lwsock32 + -lsilc \ + -lsilcclient ## @@ -123,7 +120,7 @@ all: $(TARGET).dll install: - cp $(SILC_ROOT)/$(TARGET).dll $(DLL_INSTALL_DIR) + cp $(SILC_TOP)/$(TARGET).dll $(DLL_INSTALL_DIR) cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)