compilation fix

[wxWidgets.git] / src / msw / makefile.g95

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 3fd9b2624008d0bfba5325ca111ea3d8b87536bc..a0c1924acb108a24c98873b1495d551e320b552e 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -6,7 +6,6 @@
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
 # Created:  1993
 # Updated:  1999
-# Copyright:,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 #
@@ -93,11 +92,9 @@ GENERICOBJS = \
                $(GENDIR)/numdlgg.$(OBJSUFF) \
                $(GENDIR)/panelg.$(OBJSUFF) \
                $(GENDIR)/progdlgg.$(OBJSUFF) \
-               $(GENDIR)/prop.$(OBJSUFF) \
-               $(GENDIR)/propform.$(OBJSUFF) \
-               $(GENDIR)/proplist.$(OBJSUFF) \
                $(GENDIR)/sashwin.$(OBJSUFF) \
                $(GENDIR)/scrlwing.$(OBJSUFF) \
+               $(GENDIR)/selstore.$(OBJSUFF) \
                $(GENDIR)/spinctlg.$(OBJSUFF) \
                $(GENDIR)/splash.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
@@ -107,11 +104,10 @@ GENERICOBJS = \
                $(GENDIR)/tipdlg.$(OBJSUFF) \
                $(GENDIR)/tipwin.$(OBJSUFF) \
                $(GENDIR)/treectlg.$(OBJSUFF) \
-               $(GENDIR)/treelay.$(OBJSUFF) \
                $(GENDIR)/wizard.$(OBJSUFF)
 
 COMMONOBJS_BASE  = \
-                $(COMMDIR)/appcmn.$(OBJSUFF) \
+                $(COMMDIR)/appbase.$(OBJSUFF) \
                $(COMMDIR)/clntdata.$(OBJSUFF) \
                $(COMMDIR)/cmdline.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
@@ -132,7 +128,7 @@ COMMONOBJS_BASE  = \
                $(COMMDIR)/filefn.$(OBJSUFF) \
                $(COMMDIR)/filename.$(OBJSUFF) \
                $(COMMDIR)/filesys.$(OBJSUFF) \
-               $(COMMDIR)/fontmap.$(OBJSUFF) \
+               $(COMMDIR)/fmapbase.$(OBJSUFF) \
                $(COMMDIR)/fs_inet.$(OBJSUFF) \
                $(COMMDIR)/fs_mem.$(OBJSUFF) \
                $(COMMDIR)/fs_zip.$(OBJSUFF) \
@@ -159,13 +155,13 @@ COMMONOBJS_BASE  = \
                $(COMMDIR)/sckipc.$(OBJSUFF) \
                $(COMMDIR)/sckstrm.$(OBJSUFF) \
                $(COMMDIR)/socket.$(OBJSUFF) \
+               $(COMMDIR)/stopwatch.$(OBJSUFF) \
                $(COMMDIR)/strconv.$(OBJSUFF) \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/sysopt.$(OBJSUFF) \
                $(COMMDIR)/textbuf.$(OBJSUFF) \
                $(COMMDIR)/textfile.$(OBJSUFF) \
-               $(COMMDIR)/timercmn.$(OBJSUFF) \
                $(COMMDIR)/tokenzr.$(OBJSUFF) \
                $(COMMDIR)/txtstrm.$(OBJSUFF) \
                $(COMMDIR)/unzip.$(OBJSUFF) \
@@ -182,8 +178,8 @@ COMMONOBJS_BASEONLY  = \
 
 COMMONOBJS  = \
                 $(COMMONOBJS_BASE) \
-               $(COMMDIR)/y_tab.$(OBJSUFF) \
                $(COMMDIR)/accesscmn.$(OBJSUFF) \
+               $(COMMDIR)/appcmn.$(OBJSUFF) \
                $(COMMDIR)/artprov.$(OBJSUFF) \
                $(COMMDIR)/artstd.$(OBJSUFF) \
                $(COMMDIR)/choiccmn.$(OBJSUFF) \
@@ -194,6 +190,7 @@ COMMONOBJS  = \
                $(COMMDIR)/cshelp.$(OBJSUFF) \
                $(COMMDIR)/ctrlcmn.$(OBJSUFF) \
                $(COMMDIR)/ctrlsub.$(OBJSUFF) \
+               $(COMMDIR)/datacmn.$(OBJSUFF) \
                $(COMMDIR)/dbgrid.$(OBJSUFF) \
                $(COMMDIR)/dcbase.$(OBJSUFF) \
                $(COMMDIR)/dlgcmn.$(OBJSUFF) \
@@ -205,7 +202,9 @@ COMMONOBJS  = \
                $(COMMDIR)/dseldlg.$(OBJSUFF) \
                $(COMMDIR)/effects.$(OBJSUFF) \
                $(COMMDIR)/fddlgcmn.$(OBJSUFF) \
+               $(COMMDIR)/fldlgcmn.$(OBJSUFF) \
                $(COMMDIR)/fontcmn.$(OBJSUFF) \
+               $(COMMDIR)/fontmap.$(OBJSUFF) \
                $(COMMDIR)/framecmn.$(OBJSUFF) \
                $(COMMDIR)/gaugecmn.$(OBJSUFF) \
                $(COMMDIR)/gdicmn.$(OBJSUFF) \
@@ -235,20 +234,20 @@ COMMONOBJS  = \
                $(COMMDIR)/prntbase.$(OBJSUFF) \
                $(COMMDIR)/quantize.$(OBJSUFF) \
                $(COMMDIR)/radiocmn.$(OBJSUFF) \
-               $(COMMDIR)/resource.$(OBJSUFF) \
                $(COMMDIR)/rgncmn.$(OBJSUFF) \
                $(COMMDIR)/settcmn.$(OBJSUFF) \
                $(COMMDIR)/sizer.$(OBJSUFF) \
                $(COMMDIR)/statbar.$(OBJSUFF) \
+               $(COMMDIR)/taskbarcmn.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
                $(COMMDIR)/textcmn.$(OBJSUFF) \
+               $(COMMDIR)/timercmn.$(OBJSUFF) \
                $(COMMDIR)/toplvcmn.$(OBJSUFF) \
                $(COMMDIR)/treebase.$(OBJSUFF) \
                $(COMMDIR)/valgen.$(OBJSUFF) \
                $(COMMDIR)/validate.$(OBJSUFF) \
                $(COMMDIR)/valtext.$(OBJSUFF) \
                $(COMMDIR)/wincmn.$(OBJSUFF) \
-               $(COMMDIR)/wxexpr.$(OBJSUFF) \
                $(COMMDIR)/xpmdecod.$(OBJSUFF)
 
 HTMLOBJS = \
@@ -274,12 +273,14 @@ HTMLOBJS = \
                $(HTMLDIR)/winpars.$(OBJSUFF)
 
 MSWOBJS_BASE = \
-                $(MSWDIR)/dde.$(OBJSUFF) \
+                $(MSWDIR)/basemsw.$(OBJSUFF) \
+               $(MSWDIR)/dde.$(OBJSUFF) \
                $(MSWDIR)/dir.$(OBJSUFF) \
                $(MSWDIR)/gsocket.$(OBJSUFF) \
                $(MSWDIR)/gsockmsw.$(OBJSUFF) \
                $(MSWDIR)/main.$(OBJSUFF) \
                $(MSWDIR)/mimetype.$(OBJSUFF) \
+               $(MSWDIR)/mslu.$(OBJSUFF) \
                $(MSWDIR)/regconf.$(OBJSUFF) \
                $(MSWDIR)/registry.$(OBJSUFF) \
                $(MSWDIR)/snglinst.$(OBJSUFF) \
@@ -345,7 +346,6 @@ MSWOBJS     = \
                $(MSWDIR)/metafile.$(OBJSUFF) \
                $(MSWDIR)/minifram.$(OBJSUFF) \
                $(MSWDIR)/msgdlg.$(OBJSUFF) \
-               $(MSWDIR)/mslu.$(OBJSUFF) \
                $(MSWDIR)/nativdlg.$(OBJSUFF) \
                $(MSWDIR)/notebook.$(OBJSUFF) \
                $(MSWDIR)/ownerdrw.$(OBJSUFF) \
@@ -377,6 +377,8 @@ MSWOBJS     = \
                $(MSWDIR)/tooltip.$(OBJSUFF) \
                $(MSWDIR)/toplevel.$(OBJSUFF) \
                $(MSWDIR)/treectrl.$(OBJSUFF) \
+               $(MSWDIR)/utilsgui.$(OBJSUFF) \
+               $(MSWDIR)/uxtheme.$(OBJSUFF) \
                $(MSWDIR)/wave.$(OBJSUFF) \
                $(MSWDIR)/window.$(OBJSUFF)
 
@@ -623,52 +625,11 @@ $(REGEXLIB):
 
 $(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h
 
-$(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
-       $(CCLEX) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) -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
-
-$(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
-       $(COPY) ../common/doslex.c ../common/lex_yy.c
-
-# Replace lex with flex if you run into compilation
-# problems with lex_yy.c. See also note about LEX_SCANNER
-# above.
-# $(COMMDIR)/lex_yy.c: $(COMMDIR)/lexer.l
-#      $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
-#
-# Try one of these if the above line doesn't work.
-# Alternative syntax (1)
-#      $(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
-# Alternative syntax (2)
-#      $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
-#
-#      sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
-#      sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
-#       sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c
-#      rm -f lex.yy.c
-#
-# Replace yacc with bison if you run into compilation
-# problems with y_tab.c.
-#
-# $(COMMDIR)/y_tab.c:  $(COMMDIR)/parser.y
-#      $(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
-#
-# If you use e.g. gcc on Unix, uncomment these lines
-# and comment out the above.
-#
-# $(COMMDIR)/y_tab.c:  $(COMMDIR)/parser.y
-#      $(YACC) $(COMMDIR)/parser.y
-#      mv y.tab.c $(COMMDIR)/y_tab.c
-
 clean:
        -$(RM) *.o
        -$(RM) ole/*.o
        -$(RM) *.bak
        -$(RM) core
-       -$(RM) ../common/y_tab.c
-       -$(RM) ../common/lex_yy.c
        -$(RM) ../common/*.o
        -$(RM) ../common/*.bak
        -$(RM) ../generic/*.o