Misc fixes

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

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index bcf223fb664509f1c4df666e2e6911e78d3f5a30..27a9d79c744290d7e35317f0af51963fbb26ceb9 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 14:31, 2000/01/19
+# This file was automatically generated by tmake at 15:55, 2000/03/14

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #


@@ -72,7 +72,9 @@ GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/calctrl.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/calctrl.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \

+               $(GENDIR)/dragimgg.$(OBJSUFF) \

                $(GENDIR)/grid.$(OBJSUFF) \
                $(GENDIR)/grid.$(OBJSUFF) \

+               $(GENDIR)/gridsel.$(OBJSUFF) \

                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/logg.$(OBJSUFF) \
                $(GENDIR)/numdlgg.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/logg.$(OBJSUFF) \
                $(GENDIR)/numdlgg.$(OBJSUFF) \


@@ -86,10 +88,10 @@ GENERICOBJS = \
                $(GENDIR)/scrolwin.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \
                $(GENDIR)/scrolwin.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \

-        $(GENDIR)/tabg.$(OBJSUFF) \

                $(GENDIR)/tbarsmpl.$(OBJSUFF) \
                $(GENDIR)/textdlgg.$(OBJSUFF) \
                $(GENDIR)/tipdlg.$(OBJSUFF) \
                $(GENDIR)/tbarsmpl.$(OBJSUFF) \
                $(GENDIR)/textdlgg.$(OBJSUFF) \
                $(GENDIR)/tipdlg.$(OBJSUFF) \

+               $(GENDIR)/treelay.$(OBJSUFF) \

                $(GENDIR)/wizard.$(OBJSUFF)
 
 COMMONOBJS  = \
                $(GENDIR)/wizard.$(OBJSUFF)
 
 COMMONOBJS  = \


@@ -108,6 +110,7 @@ COMMONOBJS  = \
                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/dcbase.$(OBJSUFF) \
                $(COMMDIR)/dlgcmn.$(OBJSUFF) \
                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/dcbase.$(OBJSUFF) \
                $(COMMDIR)/dlgcmn.$(OBJSUFF) \

+               $(COMMDIR)/dndcmn.$(OBJSUFF) \

                $(COMMDIR)/dobjcmn.$(OBJSUFF) \
                $(COMMDIR)/docmdi.$(OBJSUFF) \
                $(COMMDIR)/docview.$(OBJSUFF) \
                $(COMMDIR)/dobjcmn.$(OBJSUFF) \
                $(COMMDIR)/docmdi.$(OBJSUFF) \
                $(COMMDIR)/docview.$(OBJSUFF) \


@@ -125,9 +128,11 @@ COMMONOBJS  = \
                $(COMMDIR)/fontmap.$(OBJSUFF) \
                $(COMMDIR)/framecmn.$(OBJSUFF) \
                $(COMMDIR)/fs_inet.$(OBJSUFF) \
                $(COMMDIR)/fontmap.$(OBJSUFF) \
                $(COMMDIR)/framecmn.$(OBJSUFF) \
                $(COMMDIR)/fs_inet.$(OBJSUFF) \

+               $(COMMDIR)/fs_mem.$(OBJSUFF) \

                $(COMMDIR)/fs_zip.$(OBJSUFF) \
                $(COMMDIR)/ftp.$(OBJSUFF) \
                $(COMMDIR)/gdicmn.$(OBJSUFF) \
                $(COMMDIR)/fs_zip.$(OBJSUFF) \
                $(COMMDIR)/ftp.$(OBJSUFF) \
                $(COMMDIR)/gdicmn.$(OBJSUFF) \

+               $(COMMDIR)/geometry.$(OBJSUFF) \

                $(COMMDIR)/gifdecod.$(OBJSUFF) \
                $(COMMDIR)/hash.$(OBJSUFF) \
                $(COMMDIR)/helpbase.$(OBJSUFF) \
                $(COMMDIR)/gifdecod.$(OBJSUFF) \
                $(COMMDIR)/hash.$(OBJSUFF) \
                $(COMMDIR)/helpbase.$(OBJSUFF) \


@@ -253,7 +258,9 @@ MSWOBJS     = \
                $(MSWDIR)/gauge95.$(OBJSUFF) \
                $(MSWDIR)/gdiimage.$(OBJSUFF) \
                $(MSWDIR)/gdiobj.$(OBJSUFF) \
                $(MSWDIR)/gauge95.$(OBJSUFF) \
                $(MSWDIR)/gdiimage.$(OBJSUFF) \
                $(MSWDIR)/gdiobj.$(OBJSUFF) \

+               $(MSWDIR)/glcanvas.$(OBJSUFF) \

                $(MSWDIR)/gsocket.$(OBJSUFF) \
                $(MSWDIR)/gsocket.$(OBJSUFF) \

+               $(MSWDIR)/gsockmsw.$(OBJSUFF) \

                $(MSWDIR)/helpwin.$(OBJSUFF) \
                $(MSWDIR)/icon.$(OBJSUFF) \
                $(MSWDIR)/imaglist.$(OBJSUFF) \
                $(MSWDIR)/helpwin.$(OBJSUFF) \
                $(MSWDIR)/icon.$(OBJSUFF) \
                $(MSWDIR)/imaglist.$(OBJSUFF) \


@@ -543,11 +550,11 @@ $(OBJECTS):       $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
 $(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.$(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) ..$(COPYSEP)common$(COPYSEP)dosyacc.c ..$(COPYSEP)common$(COPYSEP)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
 
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c

-       $(COPY) ..$(COPYSEP)common$(COPYSEP)doslex.c ..$(COPYSEP)common$(COPYSEP)lex_yy.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
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER