fixes for new lib dirs for wxMSW

[wxWidgets.git] / src / common / descrip.mms

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index a4a2fdc2c2d00d1f7254cba3f8a0ccd07c5fc5cb..4d009eafbcfd8e5d370520fb91821178f01967a1 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -7,7 +7,6 @@
 #*****************************************************************************
 .first
        define wx [--.include.wx]
-       set command $disk2:[joukj.com]bison.cld
 
 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
@@ -45,7 +44,7 @@ LEX=flex
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
-               parser.obj,\
+               appbase.obj,\
                appcmn.obj,\
                artprov.obj,\
                artstd.obj,\
@@ -60,6 +59,7 @@ OBJECTS = \
                cshelp.obj,\
                ctrlcmn.obj,\
                ctrlsub.obj,\
+               datacmn.obj,\
                datetime.obj,\
                datstrm.obj,\
                db.obj,\
@@ -82,6 +82,8 @@ OBJECTS = \
                filename.obj,\
                filefn.obj,\
                filesys.obj,\
+               fldlgcmn.obj,\
+               fmapbase.obj,\
                fontcmn.obj,\
                fontmap.obj,\
                framecmn.obj
@@ -96,6 +98,7 @@ OBJECTS1=fs_inet.obj,\
                helpbase.obj,\
                http.obj,\
                iconbndl.obj,\
+               init.obj,\
                imagall.obj,\
                imagbmp.obj,\
                image.obj,\
@@ -119,6 +122,7 @@ OBJECTS1=fs_inet.obj,\
                menucmn.obj,\
                mimecmn.obj,\
                module.obj,\
+               msgout.obj,\
                mstream.obj,\
                nbkbase.obj,\
                object.obj,\
@@ -128,7 +132,7 @@ OBJECTS1=fs_inet.obj,\
                process.obj,\
                protocol.obj,\
                quantize.obj,\
-               resource.obj,\
+               rendcmn.obj,\
                sckaddr.obj,\
                sckfile.obj,\
                sckipc.obj,\
@@ -137,6 +141,7 @@ OBJECTS1=fs_inet.obj,\
                socket.obj,\
                settcmn.obj,\
                statbar.obj,\
+               stopwatch.obj,\
                strconv.obj,\
                stream.obj,\
                string.obj,\
@@ -154,6 +159,7 @@ OBJECTS1=fs_inet.obj,\
                url.obj
 
 OBJECTS2=utilscmn.obj,\
+               rgncmn.obj,\
                valgen.obj,\
                validate.obj,\
                valtext.obj,\
@@ -161,16 +167,18 @@ OBJECTS2=utilscmn.obj,\
                wfstream.obj,\
                wincmn.obj,\
                wxchar.obj,\
-               wxexpr.obj,\
                xpmdecod.obj,\
                zipstrm.obj,\
                zstream.obj
 
+OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj
+
 SOURCES = \
-               parser.y,\
+               appbase.cpp,\
                appcmn.cpp,\
                artprov.cpp,\
                artstd.cpp,\
+               bmpbase.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\
@@ -182,6 +190,7 @@ SOURCES = \
                cshelp.cpp,\
                ctrlcmn.cpp,\
                ctrlsub.cpp,\
+               datacmn.cpp,\
                datetime.cpp,\
                datstrm.cpp,\
                db.cpp,\
@@ -204,12 +213,15 @@ SOURCES = \
                filename.cpp,\
                filefn.cpp,\
                filesys.cpp,\
+               fldlgcmn.cpp,\
+               fmapbase.cpp,\
                fontcmn.cpp,\
                fontmap.cpp,\
                framecmn.cpp,\
                fs_inet.cpp,\
                fs_zip.cpp,\
                ftp.cpp,\
+               gaugecmn.cpp,\
                gdicmn.cpp,\
                gifdecod.cpp,\
                hash.cpp,\
@@ -217,6 +229,7 @@ SOURCES = \
                helpbase.cpp,\
                http.cpp,\
                iconbndl.cpp,\
+               init.cpp,\
                imagall.cpp,\
                imagbmp.cpp,\
                image.cpp,\
@@ -240,6 +253,7 @@ SOURCES = \
                menucmn.cpp,\
                mimecmn.cpp,\
                module.cpp,\
+               msgout.cpp,\
                mstream.cpp,\
                nbkbase.cpp,\
                object.cpp,\
@@ -249,7 +263,8 @@ SOURCES = \
                process.cpp,\
                protocol.cpp,\
                quantize.cpp,\
-               resource.cpp,\
+               rendcmn.cpp,\
+               rgncmn.cpp,\
                sckaddr.cpp,\
                sckfile.cpp,\
                sckipc.cpp,\
@@ -258,6 +273,7 @@ SOURCES = \
                socket.cpp,\
                settcmn.cpp,\
                statbar.cpp,\
+               stopwatch.cpp,\
                strconv.cpp,\
                stream.cpp,\
                sysopt.cpp,\
@@ -281,7 +297,6 @@ SOURCES = \
                wfstream.cpp,\
                wincmn.cpp,\
                wxchar.cpp,\
-               wxexpr.cpp,\
                xpmdecod.cpp,\
                zipstrm.cpp,\
                zstream.cpp
@@ -291,9 +306,11 @@ all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS1)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS2)
 .ifdef __WXMOTIF__
+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS_MOTIF)
        library [--.lib]libwx_motif.olb $(OBJECTS)
        library [--.lib]libwx_motif.olb $(OBJECTS1)
        library [--.lib]libwx_motif.olb $(OBJECTS2)
+       library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF)
 .else
 .ifdef __WXGTK__
 .ifdef __WXUNIVERSAL__
@@ -308,28 +325,11 @@ all : $(SOURCES)
 .endif
 .endif
 
-parser.obj : parser.c lexer.c
-parser.c : parser.y lexer.c
-       $(YACC) parser.y
-       pipe $(SED) -e "s;y_tab.c;parser.y;g" < y_tab.c | \
-       $(SED) -e "s/BUFSIZ/5000/g"            | \
-       $(SED) -e "s/YYLMAX 200/YYLMAX 5000/g" | \
-       $(SED) -e "s/yy/PROIO_yy/g"            | \
-       $(SED) -e "s/input/PROIO_input/g"      | \
-       $(SED) -e "s/unput/PROIO_unput/g"      > parser.c
-       delete y_tab.c;*
-
-lexer.c : lexer.l
-       $(LEX) lexer.l
-       pipe $(SED) -e "s;lexyy.c;lexer.l;g" < lexyy.c | \
-       $(SED) -e "s/yy/PROIO_yy/g"            | \
-       $(SED) -e "s/input/PROIO_input/g"      | \
-       $(SED) -e "s/unput/PROIO_unput/g"      > lexer.c
-       delete lexyy.c;*
-
+appbase.obj : appbase.cpp
 appcmn.obj : appcmn.cpp
 artprov.obj : artprov.cpp
 artstd.obj : artstd.cpp
+bmpbase.obj : bmpbase.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 clntdata.obj : clntdata.cpp
@@ -341,6 +341,7 @@ containr.obj : containr.cpp
 cshelp.obj : cshelp.cpp
 ctrlcmn.obj : ctrlcmn.cpp
 ctrlsub.obj : ctrlsub.cpp
+datacmn.obj : datacmn.cpp
 datetime.obj : datetime.cpp
 datstrm.obj : datstrm.cpp
 db.obj : db.cpp
@@ -363,12 +364,15 @@ fileconf.obj : fileconf.cpp
 filefn.obj : filefn.cpp
 filename.obj : filename.cpp
 filesys.obj : filesys.cpp
+fldlgcmn.obj : fldlgcmn.cpp
+fmapbase.obj : fmapbase.cpp
 fontcmn.obj : fontcmn.cpp
 fontmap.obj : fontmap.cpp
 framecmn.obj : framecmn.cpp
 fs_inet.obj : fs_inet.cpp
 fs_zip.obj : fs_zip.cpp
 ftp.obj : ftp.cpp
+gaugecmn.obj : gaugecmn.cpp
 gdicmn.obj : gdicmn.cpp
 gifdecod.obj : gifdecod.cpp
 hash.obj : hash.cpp
@@ -376,6 +380,7 @@ hashmap.obj : hashmap.cpp
 helpbase.obj : helpbase.cpp
 http.obj : http.cpp
 iconbndl.obj : iconbndl.cpp
+init.obj : init.cpp
 imagall.obj : imagall.cpp
 imagbmp.obj : imagbmp.cpp
 image.obj : image.cpp
@@ -399,6 +404,7 @@ memory.obj : memory.cpp
 menucmn.obj : menucmn.cpp
 mimecmn.obj : mimecmn.cpp
 module.obj : module.cpp
+msgout.obj : msgout.cpp
 mstream.obj : mstream.cpp
 nbkbase.obj : nbkbase.cpp
 object.obj : object.cpp
@@ -408,7 +414,8 @@ prntbase.obj : prntbase.cpp
 process.obj : process.cpp
 protocol.obj : protocol.cpp
 quantize.obj : quantize.cpp
-resource.obj : resource.cpp
+rendcmn.obj : rendcmn.cpp
+rgncmn.obj : rgncmn.cpp
 sckaddr.obj : sckaddr.cpp
 sckfile.obj : sckfile.cpp
 sckipc.obj : sckipc.cpp
@@ -417,6 +424,7 @@ sizer.obj : sizer.cpp
 socket.obj : socket.cpp
 settcmn.obj : settcmn.cpp
 statbar.obj : statbar.cpp
+stopwatch.obj : stopwatch.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp
 sysopt.obj : sysopt.cpp
@@ -440,7 +448,6 @@ variant.obj : variant.cpp
 wfstream.obj : wfstream.cpp
 wincmn.obj : wincmn.cpp
 wxchar.obj : wxchar.cpp
-wxexpr.obj : wxexpr.cpp
 xpmdecod.obj : xpmdecod.cpp
 zipstrm.obj : zipstrm.cpp
 zstream.obj : zstream.cpp