* Updated README

[wxWidgets.git] / distrib / msw / tmake / g95.t

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 2619e6662457225d4ce382210b861172685e120f..a7ad909a722c5c06aae9a9f3ac2809436b11eb91 100644 (file)
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -236,17 +236,25 @@ JPEGOBJS    = \
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 
-XPMOBJS =    $(XPMDIR)/crbuffri.o\
+XPMOBJS =    $(XPMDIR)/attrib.o\
+               $(XPMDIR)/crbuffri.o\
                $(XPMDIR)/crdatfri.o\
-               $(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
+               $(XPMDIR)/create.o\
+               $(XPMDIR)/crifrbuf.o\
                $(XPMDIR)/crifrdat.o\
                $(XPMDIR)/data.o\
-               $(XPMDIR)/hashtab.o $(XPMDIR)/misc.o\
-               $(XPMDIR)/parse.o $(XPMDIR)/rdftodat.o\
+               $(XPMDIR)/image.o\
+               $(XPMDIR)/info.o\
+               $(XPMDIR)/hashtab.o\
+               $(XPMDIR)/misc.o\
+               $(XPMDIR)/parse.o\
+               $(XPMDIR)/rdftodat.o\
                $(XPMDIR)/rdftoi.o\
-               $(XPMDIR)/rgb.o $(XPMDIR)/scan.o\
-               $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
-               $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
+               $(XPMDIR)/rgb.o\
+               $(XPMDIR)/scan.o\
+               $(XPMDIR)/simx.o\
+               $(XPMDIR)/wrffrdat.o\
+               $(XPMDIR)/wrffri.o
 
 TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_close.o \
@@ -292,7 +300,11 @@ else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 
+ifndef WXMAKINGDLL
 all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)
+else
+all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) $(WXDLL)
+endif
 
 ifndef WXMAKINGDLL
 
@@ -346,23 +358,23 @@ endif
 
 
 $(ZLIBLIB): $(ZLIBOBJS)
-       ar $(AROPTIONS) $@ $(ZLIBOBJS)
+       $(AR) $(AROPTIONS) $@ $(ZLIBOBJS)
        $(RANLIB) $@
 
 $(PNGLIB): $(PNGOBJS)
-       ar $(AROPTIONS) $@ $(PNGOBJS)
+       $(AR) $(AROPTIONS) $@ $(PNGOBJS)
        $(RANLIB) $@
 
 $(JPEGLIB): $(JPEGOBJS)
-       ar $(AROPTIONS) $@ $(JPEGOBJS)
+       $(AR) $(AROPTIONS) $@ $(JPEGOBJS)
        $(RANLIB) $@
 
 $(XPMLIB): $(XPMOBJS)
-       ar $(AROPTIONS) $@ $(XPMOBJS)
+       $(AR) $(AROPTIONS) $@ $(XPMOBJS)
        $(RANLIB) $@
 
 $(TIFFLIB): $(TIFFOBJS)
-       ar $(AROPTIONS) $@ $(TIFFOBJS)
+       $(AR) $(AROPTIONS) $@ $(TIFFOBJS)
        $(RANLIB) $@
 
 
@@ -372,10 +384,10 @@ $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
        $(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
 
 $(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
-       $(COPY) ../common/dosyacc.c ../common/y_tab.c
+       $(COPY) ..$(COPYSEP)common$(COPYSEP)dosyacc.c ..$(COPYSEP)common$(COPYSEP)y_tab.c
 
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
-       $(COPY) ../common/doslex.c ../common/lex_yy.c
+       $(COPY) ..$(COPYSEP)common$(COPYSEP)doslex.c ..$(COPYSEP)common$(COPYSEP)lex_yy.c
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
@@ -430,6 +442,11 @@ clean:
        -$(RM) ../tiff/*.o
        -$(RM) ../tiff/*.bak
        -$(RM) $(WXLIB)
+       -$(RM) $(ZLIBLIB)
+       -$(RM) $(PNGLIB)
+       -$(RM) $(JPEGLIB)
+       -$(RM) $(XPMLIB)
+       -$(RM) $(TIFFLIB)
 
 ifdef WXMAKINGDLL
        -$(RM) $(WXDLL)