From: Michael Bedward Date: Thu, 14 Oct 1999 05:41:22 +0000 (+0000) Subject: Regenerated from tmake after editing filelist.txt to add gridg.h X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/af563b66126d43ad70c474a0eb3fce9e1f799285 Regenerated from tmake after editing filelist.txt to add gridg.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index 40267b2b49..f5cf478c72 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ # -# This file was automatically generated by tmake at 19:50, 1999/10/13 +# This file was automatically generated by tmake at 15:31, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # @@ -568,6 +568,7 @@ GENERIC_HEADERS = \ generic/filedlgg.h \ generic/fontdlgg.h \ generic/grid.h \ + generic/gridg.h \ generic/helpext.h \ generic/helphtml.h \ generic/helpwxht.h \ @@ -637,7 +638,6 @@ GTK_GENERICOBJS = \ scrolwin.o \ splitter.o \ statusbr.o \ - tabg.o \ textdlgg.o \ tipdlg.o \ treectrl.o \ @@ -671,7 +671,6 @@ GTK_GENERICDEPS = \ scrolwin.d \ splitter.d \ statusbr.d \ - tabg.d \ textdlgg.d \ tipdlg.d \ treectrl.d \ @@ -1979,7 +1978,7 @@ all: @WX_ALL@ @WX_LIBRARY_NAME_SHARED@: $(OBJECTS) @$(INSTALL) -d ./lib $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS) - + CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@ @$(RM) ./lib/@WX_LIBRARY_LINK1@ @$(RM) ./lib/@WX_LIBRARY_LINK2@ @@ -1987,7 +1986,7 @@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@ - + CREATE_INSTALLED_LINKS: $(libdir)/@WX_LIBRARY_NAME_SHARED@ $(RM) $(libdir)/@WX_LIBRARY_LINK1@ $(RM) $(libdir)/@WX_LIBRARY_LINK2@ @@ -1995,7 +1994,7 @@ CREATE_INSTALLED_LINKS: $(libdir)/@WX_LIBRARY_NAME_SHARED@ $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@ $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@ $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@ - + $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h parser.o: parser.c lexer.c @@ -2039,13 +2038,13 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $( $(INSTALL) -d $(libdir)/wx/include/wx $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@ $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h - + $(INSTALL) -d $(datadir)/wx $(INSTALL) -d $(datadir)/wx/afm $(INSTALL) -d $(datadir)/wx/gs_afm $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm - + $(INSTALL) -d $(includedir)/wx $(INSTALL) -d $(includedir)/wx/msw $(INSTALL) -d $(includedir)/wx/gtk @@ -2058,7 +2057,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $( $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \ echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \ done - + write_message: @echo " " @echo " The installation of wxWindows is finished. On certain" @@ -2454,7 +2453,7 @@ SAMPLES_DIST: UTILS_DIST: mkdir $(DISTDIR)/utils cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils - + mkdir $(DISTDIR)/utils/wxMMedia2 mkdir $(DISTDIR)/utils/wxMMedia2/lib mkdir $(DISTDIR)/utils/wxMMedia2/sample @@ -2465,7 +2464,7 @@ UTILS_DIST: cp $(UTILSDIR)/wxMMedia2/lib/*.def $(DISTDIR)/utils/wxMMedia2/lib cp $(UTILSDIR)/wxMMedia2/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample - + mkdir $(DISTDIR)/utils/glcanvas mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR) cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas @@ -2473,21 +2472,21 @@ UTILS_DIST: cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/Makefile.in $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR) cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR) cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR) - + mkdir $(DISTDIR)/utils/ogl mkdir $(DISTDIR)/utils/ogl/src cp $(UTILSDIR)/ogl/Makefile.in $(DISTDIR)/utils/ogl cp $(UTILSDIR)/ogl/src/Makefile.in $(DISTDIR)/utils/ogl/src cp $(UTILSDIR)/ogl/src/*.h $(DISTDIR)/utils/ogl/src cp $(UTILSDIR)/ogl/src/*.cpp $(DISTDIR)/utils/ogl/src - + MISC_DIST: mkdir $(DISTDIR)/misc mkdir $(DISTDIR)/misc/afm cp $(MISCDIR)/afm/*.afm $(DISTDIR)/misc/afm mkdir $(DISTDIR)/misc/gs_afm cp $(MISCDIR)/gs_afm/*.afm $(DISTDIR)/misc/gs_afm - + dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) .. $(RM) -r _dist_dir diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 50b8200cd7..87f9c9ac70 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 13:22, 1999/10/06 +# This file was automatically generated by tmake at 15:31, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # @@ -148,6 +148,7 @@ COMMONOBJS = \ $(MSWDIR)\imagpcx.obj \ $(MSWDIR)\imagpng.obj \ $(MSWDIR)\imagpnm.obj \ + $(MSWDIR)\init.obj \ $(MSWDIR)\intl.obj \ $(MSWDIR)\ipcbase.obj \ $(MSWDIR)\layout.obj \ @@ -600,6 +601,8 @@ $(MSWDIR)\imagpng.obj: $(COMMDIR)\imagpng.$(SRCSUFF) $(MSWDIR)\imagpnm.obj: $(COMMDIR)\imagpnm.$(SRCSUFF) +$(MSWDIR)\init.obj: $(COMMDIR)\init.$(SRCSUFF) + $(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF) $(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF) diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index 2d42139759..7c14c2ec44 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 13:22, 1999/10/06 +# This file was automatically generated by tmake at 15:31, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T! # @@ -133,6 +133,7 @@ COMMONOBJS = \ $(MSWDIR)\imagbmp.obj \ $(MSWDIR)\image.obj \ $(MSWDIR)\imaggif.obj \ + $(MSWDIR)\init.obj \ $(MSWDIR)\intl.obj \ $(MSWDIR)\ipcbase.obj \ $(MSWDIR)\layout.obj \ @@ -496,6 +497,8 @@ $(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF) $(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF) +$(MSWDIR)\init.obj: $(COMMDIR)\init.$(SRCSUFF) + $(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF) $(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 8beda177d4..27e6602963 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 13:22, 1999/10/06 +# This file was automatically generated by tmake at 15:31, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T! # @@ -120,6 +120,7 @@ COMMONOBJS = \ $(COMMDIR)\imagbmp.obj \ $(COMMDIR)\image.obj \ $(COMMDIR)\imaggif.obj \ + $(COMMDIR)\init.obj \ $(COMMDIR)\intl.obj \ $(COMMDIR)\ipcbase.obj \ $(COMMDIR)\layout.obj \ @@ -836,6 +837,11 @@ $(COMMDIR)/imaggif.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/init.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/intl.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) diff --git a/src/msw/makefile.g295 b/src/msw/makefile.g295 index 5f34dbaded..b397b5e8f1 100644 --- a/src/msw/makefile.g295 +++ b/src/msw/makefile.g295 @@ -1,5 +1,5 @@ -# This file was automatically generated by tmake at 13:22, 1999/10/06 +# This file was automatically generated by tmake at 15:31, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G295.T! # @@ -98,6 +98,7 @@ COMMONOBJS = \ $(COMMDIR)/imagpcx.$(OBJSUFF) \ $(COMMDIR)/imagpng.$(OBJSUFF) \ $(COMMDIR)/imagpnm.$(OBJSUFF) \ + $(COMMDIR)/init.$(OBJSUFF) \ $(COMMDIR)/intl.$(OBJSUFF) \ $(COMMDIR)/ipcbase.$(OBJSUFF) \ $(COMMDIR)/layout.$(OBJSUFF) \ diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 78ec2ee9ba..4446c9fbf7 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,5 +1,5 @@ -# This file was automatically generated by tmake at 13:22, 1999/10/06 +# This file was automatically generated by tmake at 15:31, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # @@ -99,6 +99,7 @@ COMMONOBJS = \ $(COMMDIR)/imagpcx.$(OBJSUFF) \ $(COMMDIR)/imagpng.$(OBJSUFF) \ $(COMMDIR)/imagpnm.$(OBJSUFF) \ + $(COMMDIR)/init.$(OBJSUFF) \ $(COMMDIR)/intl.$(OBJSUFF) \ $(COMMDIR)/ipcbase.$(OBJSUFF) \ $(COMMDIR)/layout.$(OBJSUFF) \ diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index 22c1daf1e1..501d0accdc 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 13:22, 1999/10/06 +# This file was automatically generated by tmake at 15:31, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T! # Symantec C++ makefile for the msw objects @@ -87,6 +87,7 @@ COMMONOBJS = \ $(COMMDIR)\imagpcx.obj \ $(COMMDIR)\imagpng.obj \ $(COMMDIR)\imagpnm.obj \ + $(COMMDIR)\init.obj \ $(COMMDIR)\intl.obj \ $(COMMDIR)\ipcbase.obj \ $(COMMDIR)\layout.obj \ diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 40705836c4..d2034a804e 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 23:29, 1999/10/08 +# This file was automatically generated by tmake at 15:31, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -164,6 +164,7 @@ COMMONOBJS = \ ..\common\$D\imagpcx.obj \ ..\common\$D\imagpng.obj \ ..\common\$D\imagpnm.obj \ + ..\common\$D\init.obj \ ..\common\$D\intl.obj \ ..\common\$D\ipcbase.obj \ ..\common\$D\layout.obj \ @@ -508,7 +509,7 @@ rcparser: nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\src\msw -clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm +clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg -erase $(LIBTARGET) -erase $(WXDIR)\lib\$(WXLIBNAME).pdb -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index 565501040d..e3442ce622 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 13:22, 1999/10/06 +# This file was automatically generated by tmake at 15:31, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! #!/binb/wmake.exe @@ -112,6 +112,7 @@ COMMONOBJS = & imagpcx.obj & imagpng.obj & imagpnm.obj & + init.obj & intl.obj & ipcbase.obj & layout.obj & @@ -666,6 +667,9 @@ imagpng.obj: $(COMMDIR)\imagpng.cpp imagpnm.obj: $(COMMDIR)\imagpnm.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +init.obj: $(COMMDIR)\init.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + intl.obj: $(COMMDIR)\intl.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $<