Index: odk/pack/copying/makefile.mk
===================================================================
RCS file: /cvs/api/odk/pack/copying/makefile.mk,v
retrieving revision 1.62.20.2
diff -u -r1.62.20.2 makefile.mk
--- odk/pack/copying/makefile.mk	30 Mar 2004 14:31:23 -0000	1.62.20.2
+++ odk/pack/copying/makefile.mk	16 Apr 2004 02:38:37 -0000
@@ -126,6 +126,17 @@
 	$(DESTDIRDLL)$/$(MY_DLLPREFIX)prot_uno_uno$(MY_DLLPOSTFIX)
 
 .IF "$(GUI)"=="WNT"	
+.IF "$(COM)"=="GCC"
+LIBLIST = \
+       $(DESTDIRLIB)$/libstore.a       \
+       $(DESTDIRLIB)$/libreg.a         \
+       $(DESTDIRLIB)$/libsal.a         \
+       $(DESTDIRLIB)$/libsalhelper$(UDK_MAJOR)$(COMID).a       \
+       $(DESTDIRLIB)$/libcppu.a        \
+       $(DESTDIRLIB)$/libcppuhelper$(UDK_MAJOR)$(COMID).a      \
+       $(DESTDIRLIB)$/librmcxt.a       \
+       $(DESTDIRLIB)$/libstlport_gcc.a
+.ELSE
 LIBLIST = \
 	$(DESTDIRLIB)$/istore.lib 	\
 	$(DESTDIRLIB)$/ireg.lib 	\
@@ -139,6 +150,7 @@
 	LIBLIST += $(DESTDIRLIB)$/stlport_vc7.lib
 .ELSE
 	LIBLIST += $(DESTDIRLIB)$/stlport_vc6.lib
+.ENDIF
 .ENDIF
 .ENDIF
 
Index: odk/prj/d.lst
===================================================================
RCS file: /cvs/api/odk/prj/d.lst,v
retrieving revision 1.8.50.1
diff -u -r1.8.50.1 d.lst
--- odk/prj/d.lst	28 Jan 2004 12:59:21 -0000	1.8.50.1
+++ odk/prj/d.lst	16 Apr 2004 02:38:37 -0000
@@ -5,6 +5,7 @@
 
 ..\%__SRC%\bin\officebean.dll %_DEST%\bin%_EXT%\officebean.dll
 ..\%__SRC%\lib\libofficebean.so %_DEST%\lib%_EXT%\libofficebean.so
+..\%__SRC%\lib\libofficebean.a %_DEST%\lib%_EXT%\libofficebean.a
 ..\%__SRC%\lib\*officebean.dylib %_DEST%\lib%_EXT%\*officebean.dylib
 
 dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
Index: odk/source/bean/native/win32/makefile.mk
===================================================================
RCS file: /cvs/api/odk/source/bean/native/win32/makefile.mk,v
retrieving revision 1.7
diff -u -r1.7 makefile.mk
--- odk/source/bean/native/win32/makefile.mk	26 Mar 2003 13:40:51 -0000	1.7
+++ odk/source/bean/native/win32/makefile.mk	16 Apr 2004 02:38:37 -0000
@@ -20,7 +20,11 @@
 SHL1TARGET=$(TARGET)
 SHL1LIBS=	$(SLB)$/$(TARGET).lib
 #SHL1IMPLIB=	i$(TARGET)
+.IF "$(COM)"=="GCC"
+SHL1STDLIBS=-ljawt $(SALLIB)
+.ELSE
 SHL1STDLIBS=jawt.lib $(SALLIB)
+.ENDIF
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
Index: odk/util/odk_rules.pmk
===================================================================
RCS file: /cvs/api/odk/util/odk_rules.pmk,v
retrieving revision 1.3.20.2
diff -u -r1.3.20.2 odk_rules.pmk
--- odk/util/odk_rules.pmk	30 Mar 2004 14:32:18 -0000	1.3.20.2
+++ odk/util/odk_rules.pmk	16 Apr 2004 02:38:37 -0000
@@ -329,6 +329,10 @@
 	+-rm -f $@ >& $(NULLDEV)
 	$(GNUCOPY) $(LIBOUT)$/$(@:f) $@
 
+$(DESTDIRLIB)$/%.a : $(LIBOUT)$/%.a
+	+-rm -f $@ >& $(NULLDEV)
+	$(GNUCOPY) $(LIBOUT)$/$(@:f) $@
+
 $(DIR_CREATE_FLAG) :
 .IF "$(USE_SHELL)" != "4nt"
     +$(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) | xargs -n 10 $(MKDIRHIER) && echo "dirs created" > $@ && touch $@