# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1136328281 0
# Node ID 0438f853fc89f87cfc85ef072f93b14acb19ee8f
# Parent  d7fa486b06d32e11227d3687a2c700045d79cb1f
[gaim-migrate @ 15050]
Build sametime by default

committer: Tailor Script <tailor@pidgin.im>

diff -r d7fa486b06d3 -r 0438f853fc89 Makefile.mingw
--- a/Makefile.mingw	Tue Jan 03 22:34:11 2006 +0000
+++ b/Makefile.mingw	Tue Jan 03 22:44:41 2006 +0000
@@ -72,7 +72,7 @@
 	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw
 	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw
 	$(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f Makefile.mingw
-#	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw
+	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw
 	$(MAKE) -C $(GAIM_SRC) -f Makefile.mingw
 	$(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw
 
@@ -94,7 +94,7 @@
 	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw install
 	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw install
 	$(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f Makefile.mingw install
-#	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw install
+	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw install
 	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
 	cp $(SOUNDS) $(GAIM_INSTALL_DIR)/sounds/gaim
 
diff -r d7fa486b06d3 -r 0438f853fc89 src/protocols/sametime/Makefile.mingw
--- a/src/protocols/sametime/Makefile.mingw	Tue Jan 03 22:34:11 2006 +0000
+++ b/src/protocols/sametime/Makefile.mingw	Tue Jan 03 22:44:41 2006 +0000
@@ -109,15 +109,15 @@
 ## BUILD Dependencies
 ##
 
-$(GAIM_TOP)/src/gaim.dll.a:
-	$(MAKE) -C $(GAIM_TOP)/src -f Makefile.mingw gaim.dll.a
+$(GAIM_TOP)/src/gaim.lib:
+	$(MAKE) -C $(GAIM_TOP)/src -f Makefile.mingw gaim.lib
 
 ##
 ## BUILD DLL
 ##
 
-$(TARGET).dll: $(OBJECTS) $(GAIM_TOP)/src/gaim.dll.a
-	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
+$(TARGET).dll: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
+	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).lib -o $(TARGET).dll
 
 ##
 ## CLEAN RULES
@@ -126,4 +126,4 @@
 clean:
 	rm -rf *.o
 	rm -rf $(TARGET).dll
-	rm -rf $(TARGET).dll.a
+	rm -rf $(TARGET).lib