I had to remove (Robin's) makefile creation clause

    from the makefiles, because these deleted my
    makefiles
  Small fixes for templates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 821ca60f88edfedd4c49b8a6d7adaaa293fe1404..65243e90ccb3b538f9ece35d8573b0f89d4f6c42 100644 (file)
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -251,12 +251,6 @@ clean:
        -erase ..\png\*.o
        -erase ..\zlib\*.o
        -erase ..\jpeg\*.o
        -erase ..\png\*.o
        -erase ..\zlib\*.o
        -erase ..\jpeg\*.o

-       -erase ..\..\lib\libwx$(GUISUFFIX).a
+       -erase ..\..\lib\libwx.a

 
 cleanall: clean
 
 cleanall: clean

-
-MFTYPE=g95
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
-       cd $(WXWIN)\distrib\msw\tmake
-       tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-       copy makefile.$(MFTYPE) $(WXWIN)\src\msw

diff --git a/distrib/msw/tmake/gtk_gnu.t b/distrib/msw/tmake/gtk_gnu.t
index 76b56298b8847268be499741bfaac117e3d9db5e..c05efc55a19cf813f48715dc2228e0abfbfbc326 100644 (file)
--- a/distrib/msw/tmake/gtk_gnu.t
+++ b/distrib/msw/tmake/gtk_gnu.t
@@ -14,7 +14,7 @@
 
     #! now transform these hashes into $project tags
     foreach $file (sort keys %wxGeneric) {
 
     #! now transform these hashes into $project tags
     foreach $file (sort keys %wxGeneric) {

-        next if $wxCommon{$file} =~ /\bR\b/;
+        next if $wxGeneric{$file} =~ /\bR\b/;

 
         $file =~ s/cp?p?$/\$(OBJSUFF)/;
         $project{"WXGENERICOBJS"} .= '$(GENDIR)/' . $file . " "
 
         $file =~ s/cp?p?$/\$(OBJSUFF)/;
         $project{"WXGENERICOBJS"} .= '$(GENDIR)/' . $file . " "


@@ -83,11 +83,11 @@ RANLIB      = ranlib
 DEBUG       = 1
 
 # Misc options
 DEBUG       = 1
 
 # Misc options

-CPPOPTIONS  = __WXGTK__ -D__WXDEBUG__ -fno-rtti -fno-exceptions
-COPTIONS    = __WXGTK__ -D__WXDEBUG__
+CPPOPTIONS  = -D__WXGTK__ -D__WXDEBUG__ -D_REENTRANT -fno-rtti -fno-exceptions
+COPTIONS    = -D__WXGTK__ -D__WXDEBUG__ -D_REENTRANT

 CPPWARN     = -Wall
 CPPWARN     = -Wall

-CWARN       = -Wall
-OPTIMISE    = -O2
+CWARN       =
+OPTIMISE    = -O2 -fno-strength-reduce

 
 # object file suffix
 OBJSUFF     =o
 
 # object file suffix
 OBJSUFF     =o


@@ -132,7 +132,7 @@ GENERICOBJS = \
                 #$ ExpandList("WXGENERICOBJS");
 
 COMMONOBJS  = \
                 #$ ExpandList("WXGENERICOBJS");
 
 COMMONOBJS  = \

-               $(COMMDIR)/y_tab.$(OBJSUFF) \
+               $(COMMDIR)/parser.$(OBJSUFF) \

                #$ ExpandList("WXCOMMONOBJS");
 
 HTMLOBJS = \
                #$ ExpandList("WXCOMMONOBJS");
 
 HTMLOBJS = \


@@ -231,33 +231,37 @@ OBJECTS = $(GTKOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJ) $(UNIXOBJS) \
 
 all:    $(OBJECTS) $(WXLIB)
 
 
 all:    $(OBJECTS) $(WXLIB)
 

-$(WXLIB): $(OBJECTS) $(EXTRAOBJS)
-       ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
+$(WXLIB): $(OBJECTS)
+       ar $(AROPTIONS) $@ $(OBJECTS)

        $(RANLIB) $@
 
        $(RANLIB) $@
 

-$(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 $(CFLAGS) -DNO_CONFIGURE -o $@ $(COMMDIR)/y_tab.c
+$(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h

 
 

+$(COMMDIR)/parser.$(OBJSUFF):    $(COMMDIR)/parser.c $(COMMDIR)/lexer.c
+       $(CCLEX) -c $(CFLAGS) -o $@ $(COMMDIR)/parser.c

 
 

-$(COMMDIR)/lex_yy.c:   $(COMMDIR)/lexer.l
-       $(LEX) -o $(COMMDIR)/lex.yy.c $(COMMDIR)/lexer.l 
-       sed -e "s/BUFSIZ/5000/g" < $(COMMDIR)/lex.yy.c | \
-       sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
-        sed -e "s/YYLMAX 200/YYLMAX 5000/g" > $(COMMDIR)/lex_yy.c
-       rm -f $(COMMDIR)/lex.yy.c
-
-# Replace yacc with bison if you run into compilation
-# problems with y_tab.c.
-$(COMMDIR)/y_tab.c:    $(COMMDIR)/parser.y
+$(COMMDIR)/parser.c:   $(COMMDIR)/parser.y $(COMMDIR)/lexer.c

        $(YACC) $(COMMDIR)/parser.y
        $(YACC) $(COMMDIR)/parser.y

-       mv y.tab.c $(COMMDIR)/y_tab.c
+       @sed -e "s;$(COMMDIR)/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"      > $(COMMDIR)/parser.c
+       @$(RM) y.tab.c
+
+$(COMMDIR)/lexer.c:    $(COMMDIR)/lexer.l
+       $(LEX) $(COMMDIR)/lexer.l
+       @sed -e "s;$(COMMDIR)/lex.yy.c;lexer.l;g" < lex.yy.c | \
+       sed -e "s/yy/PROIO_yy/g"            | \
+       sed -e "s/input/PROIO_input/g"      | \
+       sed -e "s/unput/PROIO_unput/g"      > $(COMMDIR)/lexer.c
+       @$(RM) lex.yy.c

 
 clean:
        rm -f $(GTKDIR)/*.$(OBJSUFF)
 
 clean:
        rm -f $(GTKDIR)/*.$(OBJSUFF)

-       rm -f $(COMMDIR)/y_tab.c
-       rm -f $(COMMDIR)/lex_yy.c
+       rm -f $(COMMDIR)/parser.c
+       rm -f $(COMMDIR)/lexer.c

        rm -f $(COMMDIR)/*.$(OBJSUFF)
        rm -f $(GENDIR)/*.$(OBJSUFF)
        rm -f $(PNGDIR)/*.$(OBJSUFF)
        rm -f $(COMMDIR)/*.$(OBJSUFF)
        rm -f $(GENDIR)/*.$(OBJSUFF)
        rm -f $(PNGDIR)/*.$(OBJSUFF)


@@ -268,9 +272,3 @@ clean:
        rm -f $(WXWIN)/lib/libwx_$(GUI).a
 
 cleanall: clean
        rm -f $(WXWIN)/lib/libwx_$(GUI).a
 
 cleanall: clean

-
-MFTYPE=gnu
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(GUI)_$(MFTYPE).t
-       cd $(WXWIN)\distrib\msw\tmake
-       tmake -t $(GUI)_$(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-       copy makefile.$(MFTYPE) $(WXWIN)\src\$(GUI)

diff --git a/src/gtk/makefile.gnu b/src/gtk/makefile.gnu
index 5d6c28cc2ae81100a442c241afe730c9d1691642..a5a84ef35ffb2141a6e3b027e2e2a0bd3187c04d 100644 (file)
--- a/src/gtk/makefile.gnu
+++ b/src/gtk/makefile.gnu
@@ -1,5 +1,5 @@
 
 

-# This file was automatically generated by tmake at 00:12, 1999/07/29
+# This file was automatically generated by tmake at 03:16, 1999/07/29

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


@@ -40,11 +40,11 @@ RANLIB      = ranlib
 DEBUG       = 1
 
 # Misc options
 DEBUG       = 1
 
 # Misc options

-CPPOPTIONS  = __WXGTK__ -D__WXDEBUG__ -fno-rtti -fno-exceptions
-COPTIONS    = __WXGTK__ -D__WXDEBUG__
+CPPOPTIONS  = -D__WXGTK__ -D__WXDEBUG__ -D_REENTRANT -fno-rtti -fno-exceptions
+COPTIONS    = -D__WXGTK__ -D__WXDEBUG__ -D_REENTRANT

 CPPWARN     = -Wall
 CPPWARN     = -Wall

-CWARN       = -Wall
-OPTIMISE    = -O2
+CWARN       =
+OPTIMISE    = -O2 -fno-strength-reduce

 
 # object file suffix
 OBJSUFF     =o
 
 # object file suffix
 OBJSUFF     =o


@@ -88,18 +88,14 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/caret.$(OBJSUFF) \
 GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/caret.$(OBJSUFF) \

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

                $(GENDIR)/colrdlgg.$(OBJSUFF) \
                $(GENDIR)/dirdlgg.$(OBJSUFF) \
                $(GENDIR)/extdlgg.$(OBJSUFF) \
                $(GENDIR)/fontdlgg.$(OBJSUFF) \
                $(GENDIR)/gridg.$(OBJSUFF) \
                $(GENDIR)/colrdlgg.$(OBJSUFF) \
                $(GENDIR)/dirdlgg.$(OBJSUFF) \
                $(GENDIR)/extdlgg.$(OBJSUFF) \
                $(GENDIR)/fontdlgg.$(OBJSUFF) \
                $(GENDIR)/gridg.$(OBJSUFF) \

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

                $(GENDIR)/imaglist.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/listctrl.$(OBJSUFF) \
                $(GENDIR)/imaglist.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/listctrl.$(OBJSUFF) \

-               $(GENDIR)/msgdlgg.$(OBJSUFF) \
-               $(GENDIR)/notebook.$(OBJSUFF) \

                $(GENDIR)/numdlgg.$(OBJSUFF) \
                $(GENDIR)/panelg.$(OBJSUFF) \
                $(GENDIR)/printps.$(OBJSUFF) \
                $(GENDIR)/numdlgg.$(OBJSUFF) \
                $(GENDIR)/panelg.$(OBJSUFF) \
                $(GENDIR)/printps.$(OBJSUFF) \


@@ -112,13 +108,11 @@ GENERICOBJS = \
                $(GENDIR)/scrolwin.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \
                $(GENDIR)/scrolwin.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \

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

                $(GENDIR)/tipdlg.$(OBJSUFF) \
                $(GENDIR)/treectrl.$(OBJSUFF)
 
 COMMONOBJS  = \
                $(GENDIR)/tipdlg.$(OBJSUFF) \
                $(GENDIR)/treectrl.$(OBJSUFF)
 
 COMMONOBJS  = \

-               $(COMMDIR)/y_tab.$(OBJSUFF) \
+               $(COMMDIR)/parser.$(OBJSUFF) \

                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
                $(COMMDIR)/date.$(OBJSUFF) \
                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
                $(COMMDIR)/date.$(OBJSUFF) \


@@ -369,33 +363,37 @@ OBJECTS = $(GTKOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJ) $(UNIXOBJS) \
 
 all:    $(OBJECTS) $(WXLIB)
 
 
 all:    $(OBJECTS) $(WXLIB)
 

-$(WXLIB): $(OBJECTS) $(EXTRAOBJS)
-       ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
+$(WXLIB): $(OBJECTS)
+       ar $(AROPTIONS) $@ $(OBJECTS)

        $(RANLIB) $@
 
        $(RANLIB) $@
 

-$(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
+$(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h

 
 

-$(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
-       $(CCLEX) -c $(CFLAGS) -DNO_CONFIGURE -o $@ $(COMMDIR)/y_tab.c
+$(COMMDIR)/parser.$(OBJSUFF):    $(COMMDIR)/parser.c $(COMMDIR)/lexer.c
+       $(CCLEX) -c $(CFLAGS) -o $@ $(COMMDIR)/parser.c

 
 

-
-$(COMMDIR)/lex_yy.c:   $(COMMDIR)/lexer.l
-       $(LEX) -o $(COMMDIR)/lex.yy.c $(COMMDIR)/lexer.l 
-       sed -e "s/BUFSIZ/5000/g" < $(COMMDIR)/lex.yy.c | \
-       sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
-        sed -e "s/YYLMAX 200/YYLMAX 5000/g" > $(COMMDIR)/lex_yy.c
-       rm -f $(COMMDIR)/lex.yy.c
-
-# Replace yacc with bison if you run into compilation
-# problems with y_tab.c.
-$(COMMDIR)/y_tab.c:    $(COMMDIR)/parser.y
+$(COMMDIR)/parser.c:   $(COMMDIR)/parser.y $(COMMDIR)/lexer.c

        $(YACC) $(COMMDIR)/parser.y
        $(YACC) $(COMMDIR)/parser.y

-       mv y.tab.c $(COMMDIR)/y_tab.c
+       @sed -e "s;$(COMMDIR)/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"      > $(COMMDIR)/parser.c
+       @$(RM) y.tab.c
+
+$(COMMDIR)/lexer.c:    $(COMMDIR)/lexer.l
+       $(LEX) $(COMMDIR)/lexer.l
+       @sed -e "s;$(COMMDIR)/lex.yy.c;lexer.l;g" < lex.yy.c | \
+       sed -e "s/yy/PROIO_yy/g"            | \
+       sed -e "s/input/PROIO_input/g"      | \
+       sed -e "s/unput/PROIO_unput/g"      > $(COMMDIR)/lexer.c
+       @$(RM) lex.yy.c

 
 clean:
        rm -f $(GTKDIR)/*.$(OBJSUFF)
 
 clean:
        rm -f $(GTKDIR)/*.$(OBJSUFF)

-       rm -f $(COMMDIR)/y_tab.c
-       rm -f $(COMMDIR)/lex_yy.c
+       rm -f $(COMMDIR)/parser.c
+       rm -f $(COMMDIR)/lexer.c

        rm -f $(COMMDIR)/*.$(OBJSUFF)
        rm -f $(GENDIR)/*.$(OBJSUFF)
        rm -f $(PNGDIR)/*.$(OBJSUFF)
        rm -f $(COMMDIR)/*.$(OBJSUFF)
        rm -f $(GENDIR)/*.$(OBJSUFF)
        rm -f $(PNGDIR)/*.$(OBJSUFF)


@@ -406,9 +404,3 @@ clean:
        rm -f $(WXWIN)/lib/libwx_$(GUI).a
 
 cleanall: clean
        rm -f $(WXWIN)/lib/libwx_$(GUI).a
 
 cleanall: clean

-
-MFTYPE=gnu
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(GUI)_$(MFTYPE).t
-       cd $(WXWIN)\distrib\msw\tmake
-       tmake -t $(GUI)_$(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-       copy makefile.$(MFTYPE) $(WXWIN)\src\$(GUI)

diff --git a/src/gtk1/makefile.gnu b/src/gtk1/makefile.gnu
index 5d6c28cc2ae81100a442c241afe730c9d1691642..a5a84ef35ffb2141a6e3b027e2e2a0bd3187c04d 100644 (file)
--- a/src/gtk1/makefile.gnu
+++ b/src/gtk1/makefile.gnu
@@ -1,5 +1,5 @@
 
 

-# This file was automatically generated by tmake at 00:12, 1999/07/29
+# This file was automatically generated by tmake at 03:16, 1999/07/29

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


@@ -40,11 +40,11 @@ RANLIB      = ranlib
 DEBUG       = 1
 
 # Misc options
 DEBUG       = 1
 
 # Misc options

-CPPOPTIONS  = __WXGTK__ -D__WXDEBUG__ -fno-rtti -fno-exceptions
-COPTIONS    = __WXGTK__ -D__WXDEBUG__
+CPPOPTIONS  = -D__WXGTK__ -D__WXDEBUG__ -D_REENTRANT -fno-rtti -fno-exceptions
+COPTIONS    = -D__WXGTK__ -D__WXDEBUG__ -D_REENTRANT

 CPPWARN     = -Wall
 CPPWARN     = -Wall

-CWARN       = -Wall
-OPTIMISE    = -O2
+CWARN       =
+OPTIMISE    = -O2 -fno-strength-reduce

 
 # object file suffix
 OBJSUFF     =o
 
 # object file suffix
 OBJSUFF     =o


@@ -88,18 +88,14 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/caret.$(OBJSUFF) \
 GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/caret.$(OBJSUFF) \

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

                $(GENDIR)/colrdlgg.$(OBJSUFF) \
                $(GENDIR)/dirdlgg.$(OBJSUFF) \
                $(GENDIR)/extdlgg.$(OBJSUFF) \
                $(GENDIR)/fontdlgg.$(OBJSUFF) \
                $(GENDIR)/gridg.$(OBJSUFF) \
                $(GENDIR)/colrdlgg.$(OBJSUFF) \
                $(GENDIR)/dirdlgg.$(OBJSUFF) \
                $(GENDIR)/extdlgg.$(OBJSUFF) \
                $(GENDIR)/fontdlgg.$(OBJSUFF) \
                $(GENDIR)/gridg.$(OBJSUFF) \

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

                $(GENDIR)/imaglist.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/listctrl.$(OBJSUFF) \
                $(GENDIR)/imaglist.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/listctrl.$(OBJSUFF) \

-               $(GENDIR)/msgdlgg.$(OBJSUFF) \
-               $(GENDIR)/notebook.$(OBJSUFF) \

                $(GENDIR)/numdlgg.$(OBJSUFF) \
                $(GENDIR)/panelg.$(OBJSUFF) \
                $(GENDIR)/printps.$(OBJSUFF) \
                $(GENDIR)/numdlgg.$(OBJSUFF) \
                $(GENDIR)/panelg.$(OBJSUFF) \
                $(GENDIR)/printps.$(OBJSUFF) \


@@ -112,13 +108,11 @@ GENERICOBJS = \
                $(GENDIR)/scrolwin.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \
                $(GENDIR)/scrolwin.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \

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

                $(GENDIR)/tipdlg.$(OBJSUFF) \
                $(GENDIR)/treectrl.$(OBJSUFF)
 
 COMMONOBJS  = \
                $(GENDIR)/tipdlg.$(OBJSUFF) \
                $(GENDIR)/treectrl.$(OBJSUFF)
 
 COMMONOBJS  = \

-               $(COMMDIR)/y_tab.$(OBJSUFF) \
+               $(COMMDIR)/parser.$(OBJSUFF) \

                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
                $(COMMDIR)/date.$(OBJSUFF) \
                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
                $(COMMDIR)/date.$(OBJSUFF) \


@@ -369,33 +363,37 @@ OBJECTS = $(GTKOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJ) $(UNIXOBJS) \
 
 all:    $(OBJECTS) $(WXLIB)
 
 
 all:    $(OBJECTS) $(WXLIB)
 

-$(WXLIB): $(OBJECTS) $(EXTRAOBJS)
-       ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
+$(WXLIB): $(OBJECTS)
+       ar $(AROPTIONS) $@ $(OBJECTS)

        $(RANLIB) $@
 
        $(RANLIB) $@
 

-$(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
+$(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h

 
 

-$(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
-       $(CCLEX) -c $(CFLAGS) -DNO_CONFIGURE -o $@ $(COMMDIR)/y_tab.c
+$(COMMDIR)/parser.$(OBJSUFF):    $(COMMDIR)/parser.c $(COMMDIR)/lexer.c
+       $(CCLEX) -c $(CFLAGS) -o $@ $(COMMDIR)/parser.c

 
 

-
-$(COMMDIR)/lex_yy.c:   $(COMMDIR)/lexer.l
-       $(LEX) -o $(COMMDIR)/lex.yy.c $(COMMDIR)/lexer.l 
-       sed -e "s/BUFSIZ/5000/g" < $(COMMDIR)/lex.yy.c | \
-       sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
-        sed -e "s/YYLMAX 200/YYLMAX 5000/g" > $(COMMDIR)/lex_yy.c
-       rm -f $(COMMDIR)/lex.yy.c
-
-# Replace yacc with bison if you run into compilation
-# problems with y_tab.c.
-$(COMMDIR)/y_tab.c:    $(COMMDIR)/parser.y
+$(COMMDIR)/parser.c:   $(COMMDIR)/parser.y $(COMMDIR)/lexer.c

        $(YACC) $(COMMDIR)/parser.y
        $(YACC) $(COMMDIR)/parser.y

-       mv y.tab.c $(COMMDIR)/y_tab.c
+       @sed -e "s;$(COMMDIR)/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"      > $(COMMDIR)/parser.c
+       @$(RM) y.tab.c
+
+$(COMMDIR)/lexer.c:    $(COMMDIR)/lexer.l
+       $(LEX) $(COMMDIR)/lexer.l
+       @sed -e "s;$(COMMDIR)/lex.yy.c;lexer.l;g" < lex.yy.c | \
+       sed -e "s/yy/PROIO_yy/g"            | \
+       sed -e "s/input/PROIO_input/g"      | \
+       sed -e "s/unput/PROIO_unput/g"      > $(COMMDIR)/lexer.c
+       @$(RM) lex.yy.c

 
 clean:
        rm -f $(GTKDIR)/*.$(OBJSUFF)
 
 clean:
        rm -f $(GTKDIR)/*.$(OBJSUFF)

-       rm -f $(COMMDIR)/y_tab.c
-       rm -f $(COMMDIR)/lex_yy.c
+       rm -f $(COMMDIR)/parser.c
+       rm -f $(COMMDIR)/lexer.c

        rm -f $(COMMDIR)/*.$(OBJSUFF)
        rm -f $(GENDIR)/*.$(OBJSUFF)
        rm -f $(PNGDIR)/*.$(OBJSUFF)
        rm -f $(COMMDIR)/*.$(OBJSUFF)
        rm -f $(GENDIR)/*.$(OBJSUFF)
        rm -f $(PNGDIR)/*.$(OBJSUFF)


@@ -406,9 +404,3 @@ clean:
        rm -f $(WXWIN)/lib/libwx_$(GUI).a
 
 cleanall: clean
        rm -f $(WXWIN)/lib/libwx_$(GUI).a
 
 cleanall: clean

-
-MFTYPE=gnu
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(GUI)_$(MFTYPE).t
-       cd $(WXWIN)\distrib\msw\tmake
-       tmake -t $(GUI)_$(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-       copy makefile.$(MFTYPE) $(WXWIN)\src\$(GUI)

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 1cfd01d61e0b245b43af39fce9e91f78122e08fe..67e34debb17d6f6f8dfde6bd336722d0d82683ab 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,6 +1,5 @@
 
 

-
-# This file was automatically generated by tmake at 00:12, 1999/07/29
+# This file was automatically generated by tmake at 02:15, 1999/07/29

 # 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!
 
 #


@@ -380,12 +379,6 @@ clean:
        -erase ..\png\*.o
        -erase ..\zlib\*.o
        -erase ..\jpeg\*.o
        -erase ..\png\*.o
        -erase ..\zlib\*.o
        -erase ..\jpeg\*.o

-       -erase ..\..\lib\libwx$(GUISUFFIX).a
+       -erase ..\..\lib\libwx.a

 
 cleanall: clean
 
 cleanall: clean

-
-MFTYPE=g95
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
-       cd $(WXWIN)\distrib\msw\tmake
-       tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-       copy makefile.$(MFTYPE) $(WXWIN)\src\msw