# HG changeset patch
# User Herman Bloggs <hermanator12002@yahoo.com>
# Date 1064900525 0
# Node ID c92dbccd744845c3405eb90e1c6f317eced9fbe7
# Parent  2234420abada65e33ecc7037247499484ab82402
[gaim-migrate @ 7619]
Update mingw makefiles for ssl plugin

committer: Tailor Script <tailor@pidgin.im>

diff -r 2234420abada -r c92dbccd7448 Makefile.mingw
--- a/Makefile.mingw	Tue Sep 30 05:40:09 2003 +0000
+++ b/Makefile.mingw	Tue Sep 30 05:42:05 2003 +0000
@@ -12,8 +12,6 @@
 GAIM_SOUNDS = ./sounds
 GAIM_INSTALL_DIR = ./win32-install-dir
 GTKSPELL_TOP = ../win32-dev/gtkspell-2.0.4/gtkspell
-NSS_TOP = ../win32-dev/nss-3.8
-NSPR_TOP = ../win32-dev/nspr-4.3
 IDLETRACK_TOP = $(GAIM_SRC)/win32/IdleTracker
 GTKRC_TOP = ../win32-dev/gtkrc
 OSCAR = $(GAIM_PROTOS)/oscar
@@ -30,15 +28,7 @@
 VERSION := $(shell cat ./VERSION)
 
 NEEDED_DLLS =		$(GTKSPELL_TOP)/libgtkspell.dll \
-			$(IDLETRACK_TOP)/idletrack.dll \
-			$(NSS_TOP)/lib/nss3.dll \
-			$(NSS_TOP)/lib/nssckbi.dll \
-			$(NSS_TOP)/lib/softokn3.dll \
-			$(NSS_TOP)/lib/ssl3.dll \
-			$(NSPR_TOP)/lib/nspr4.dll \
-			$(NSPR_TOP)/lib/plc4.dll \
-			$(NSPR_TOP)/lib/plds4.dll
-
+			$(IDLETRACK_TOP)/idletrack.dll
 
 SOUNDS =		$(GAIM_SOUNDS)/leave.wav \
 			$(GAIM_SOUNDS)/redalert.wav \
diff -r 2234420abada -r c92dbccd7448 plugins/Makefile.mingw
--- a/plugins/Makefile.mingw	Tue Sep 30 05:40:09 2003 +0000
+++ b/plugins/Makefile.mingw	Tue Sep 30 05:42:05 2003 +0000
@@ -18,6 +18,7 @@
 WINPREFS :=		./win32/winprefs
 PERL_PLUGIN_LOADER :=	./perl
 DOCKLET :=		./docklet
+SSL :=			./ssl
 
 ##
 ## VARIABLE DEFINITIONS
@@ -90,6 +91,7 @@
 	$(MAKE) -C $(TRANSPARENCY) -f Makefile.mingw
 	$(MAKE) -C $(PERL_PLUGIN_LOADER) -f Makefile.mingw
 	$(MAKE) -C $(DOCKLET) -f Makefile.mingw
+	$(MAKE) -C $(SSL) -f Makefile.mingw
 
 install:
 	cp $(GAIM_PLUGINS)/*.dll $(GAIM_INSTALL_DIR)/plugins
@@ -98,6 +100,7 @@
 	$(MAKE) -C $(TRANSPARENCY) -f Makefile.mingw install
 	$(MAKE) -C $(PERL_PLUGIN_LOADER) -f Makefile.mingw install
 	$(MAKE) -C $(DOCKLET) -f Makefile.mingw install
+	$(MAKE) -C $(SSL) -f Makefile.mingw install
 
 #
 # BUILD Plugin
@@ -129,3 +132,4 @@
 	$(MAKE) -C $(WINPREFS) -f Makefile.mingw clean
 	$(MAKE) -C $(PERL_PLUGIN_LOADER) -f Makefile.mingw clean
 	$(MAKE) -C $(DOCKLET) -f Makefile.mingw clean
+	$(MAKE) -C $(SSL) -f Makefile.mingw clean
diff -r 2234420abada -r c92dbccd7448 plugins/ssl/Makefile.mingw
--- a/plugins/ssl/Makefile.mingw	Tue Sep 30 05:40:09 2003 +0000
+++ b/plugins/ssl/Makefile.mingw	Tue Sep 30 05:42:05 2003 +0000
@@ -22,6 +22,14 @@
 TARGET = ssl
 TARGET_NSS = ssl-nss
 
+NEEDED_DLLS =		$(NSS_DIR)/lib/nss3.dll \
+			$(NSS_DIR)/lib/nssckbi.dll \
+			$(NSS_DIR)/lib/softokn3.dll \
+			$(NSS_DIR)/lib/ssl3.dll \
+			$(NSPR_DIR)/lib/nspr4.dll \
+			$(NSPR_DIR)/lib/plc4.dll \
+			$(NSPR_DIR)/lib/plds4.dll
+
 # Compiler Options
 
 CFLAGS =
@@ -108,7 +116,7 @@
 install:
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
 	cp $(TARGET_NSS).dll $(DLL_INSTALL_DIR)
-
+	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
 
 ##
 ## BUILD Dependencies
@@ -123,6 +131,7 @@
 
 $(TARGET).dll: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
+
 $(TARGET_NSS).dll: $(OBJECTS_NSS) $(GAIM_TOP)/src/gaim.lib
 	$(CC) -shared $(OBJECTS_NSS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET_NSS).dll