Compile with OpenWatcom command line compiler in MSYS.

Sorry some files are lacked in the last commit.

Edited Files:
   interface/Makefile.am interface/ncurs_c.c libarc/Makefile.am
   libunimod/Makefile.am utils/Makefile.am
   utils/Makefile.in

Modified Files:
   interface/Makefile.am interface/Makefile.in
   interface/ncurs_c.c interface/bitmaps/Makefile.in
   interface/motif_bitmaps/Makefile.in
   interface/pixmaps/Makefile.in libarc/Makefile.am
   libarc/Makefile.in libunimod/Makefile.am libunimod/Makefile.in
   script/Makefile.in timidity/Makefile.in utils/Makefile.am
   utils/Makefile.in

diff --git a/interface/Makefile.am b/interface/Makefile.am
index 2732065..ea40f98 100644 (file)
--- a/interface/Makefile.am
+++ b/interface/Makefile.am
@@ -193,11 +193,20 @@ if BORLANDC
        done
        if test -f interface.lib ; then touch $@ ; fi
 else
+if WATCOM
+       rm -f libinterface.a
+       rm -f interface.lib
+       for foo in   $(libinterface_a_OBJECTS) $(libinterface_LIBADD) ;do \
+         wlib -q interface.lib +$$foo; \
+       done
+       if test -f interface.lib ; then touch $@ ; fi
+else
        rm -f libinterface.a
        $(AR) cru libinterface.a $(libinterface_a_OBJECTS) $(libinterface_a_LIBADD)
        $(RANLIB) libinterface.a
 endif
 endif
+endif
 
 # Tcl interface sources
 TCLSRCS = tkmidity.ptcl tkpanel.tcl browser.tcl misc.tcl
@@ -278,6 +287,11 @@ w32g_res.res: w32g_res.h w32g_rec.h w32g_res.rc \
        w32g_btn.bmp w32g_icon.ico w32g_sleep.bmp w32g_subbtn.bmp 
        rc w32g_res.rc
 else
+if WATCOM
+w32g_res.res: w32g_res.h w32g_rec.h w32g_res.rc \
+       w32g_btn.bmp w32g_icon.ico w32g_sleep.bmp w32g_subbtn.bmp 
+       rc w32g_res.rc
+else
 if BORLANDC
 w32g_res.res: w32g_res.h w32g_rec.h w32g_res.rc \
        w32g_btn.bmp w32g_icon.ico w32g_sleep.bmp w32g_subbtn.bmp
@@ -300,6 +314,7 @@ w32g_res.res: w32g_res.h w32g_rec.h w32g_res.rc \
        rm w32g_res_escaped.rc
 endif
 endif
+endif
 
 ## This is another way to build japanese resource for mingw.
 #BRCC32 = c:/borland/bcc55/bin/brcc32.exe

diff --git a/interface/Makefile.in b/interface/Makefile.in
index 1c50e46..2a221d6 100644 (file)
--- a/interface/Makefile.in
+++ b/interface/Makefile.in
@@ -219,6 +219,9 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
 W32READDIR_FALSE = @W32READDIR_FALSE@
 W32READDIR_TRUE = @W32READDIR_TRUE@
+WATCOM_FALSE = @WATCOM_FALSE@
+WATCOM_LDFLAGS = @WATCOM_LDFLAGS@
+WATCOM_TRUE = @WATCOM_TRUE@
 WISH = @WISH@
 W_so_libs = @W_so_libs@
 X_CFLAGS = @X_CFLAGS@
@@ -1157,9 +1160,15 @@ libinterface.a: $(libinterface_a_OBJECTS) $(libinterface_a_DEPENDENCIES) $(libin
 @BORLANDC_TRUE@@VCPP_FALSE@      tlib interface.lib +$$foo; \
 @BORLANDC_TRUE@@VCPP_FALSE@    done
 @BORLANDC_TRUE@@VCPP_FALSE@    if test -f interface.lib ; then touch $@ ; fi
-@BORLANDC_FALSE@@VCPP_FALSE@   rm -f libinterface.a
-@BORLANDC_FALSE@@VCPP_FALSE@   $(AR) cru libinterface.a $(libinterface_a_OBJECTS) $(libinterface_a_LIBADD)
-@BORLANDC_FALSE@@VCPP_FALSE@   $(RANLIB) libinterface.a
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      rm -f libinterface.a
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      rm -f interface.lib
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      for foo in   $(libinterface_a_OBJECTS) $(libinterface_LIBADD) ;do \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@        wlib -q interface.lib +$$foo; \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      done
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      if test -f interface.lib ; then touch $@ ; fi
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     rm -f libinterface.a
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     $(AR) cru libinterface.a $(libinterface_a_OBJECTS) $(libinterface_a_LIBADD)
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     $(RANLIB) libinterface.a
 
 .ptcl.tcl:
        sed -e 's@%TCL_DIR%@$(TCL_DIR)@g' $< > $@
@@ -1193,24 +1202,27 @@ install.el: $(ELFILES)
 @VCPP_TRUE@w32g_res.res: w32g_res.h w32g_rec.h w32g_res.rc \
 @VCPP_TRUE@    w32g_btn.bmp w32g_icon.ico w32g_sleep.bmp w32g_subbtn.bmp 
 @VCPP_TRUE@    rc w32g_res.rc
-@BORLANDC_TRUE@@VCPP_FALSE@w32g_res.res: w32g_res.h w32g_rec.h w32g_res.rc \
-@BORLANDC_TRUE@@VCPP_FALSE@    w32g_btn.bmp w32g_icon.ico w32g_sleep.bmp w32g_subbtn.bmp
-@BORLANDC_TRUE@@VCPP_FALSE@    perl -pe 's/(^FONT.*".*").*$$/$$1/' w32g_res.rc >w32g_res_bc.rc
-@BORLANDC_TRUE@@VCPP_FALSE@    brcc32 -ic:/borland/bcc55/include w32g_res_bc.rc
-@BORLANDC_TRUE@@VCPP_FALSE@    mv w32g_res_bc.RES w32g_res.res
-@BORLANDC_TRUE@@VCPP_FALSE@    rm w32g_res_bc.rc
-@BORLANDC_FALSE@@VCPP_FALSE@w32g_syn_escaped.c:w32g_syn.c escape_sjis.pl
-@BORLANDC_FALSE@@VCPP_FALSE@   escape_sjis.pl < w32g_syn.c > w32g_syn_escaped.c
-
-@BORLANDC_FALSE@@VCPP_FALSE@w32g_subwin_escaped.c:w32g_subwin.c escape_sjis.pl
-@BORLANDC_FALSE@@VCPP_FALSE@   escape_sjis.pl < w32g_subwin.c > w32g_subwin_escaped.c
-
-@BORLANDC_FALSE@@VCPP_FALSE@w32g_res.res: w32g_res.h w32g_rec.h w32g_res.rc \
-@BORLANDC_FALSE@@VCPP_FALSE@   w32g_btn.bmp w32g_icon.ico w32g_sleep.bmp w32g_subbtn.bmp \
-@BORLANDC_FALSE@@VCPP_FALSE@   escape_sjis.pl
-@BORLANDC_FALSE@@VCPP_FALSE@   escape_sjis.pl <w32g_res.rc >w32g_res_escaped.rc
-@BORLANDC_FALSE@@VCPP_FALSE@   windres -o $@ -O coff w32g_res_escaped.rc
-@BORLANDC_FALSE@@VCPP_FALSE@   rm w32g_res_escaped.rc
+@VCPP_FALSE@@WATCOM_TRUE@w32g_res.res: w32g_res.h w32g_rec.h w32g_res.rc \
+@VCPP_FALSE@@WATCOM_TRUE@      w32g_btn.bmp w32g_icon.ico w32g_sleep.bmp w32g_subbtn.bmp 
+@VCPP_FALSE@@WATCOM_TRUE@      rc w32g_res.rc
+@BORLANDC_TRUE@@VCPP_FALSE@@WATCOM_FALSE@w32g_res.res: w32g_res.h w32g_rec.h w32g_res.rc \
+@BORLANDC_TRUE@@VCPP_FALSE@@WATCOM_FALSE@      w32g_btn.bmp w32g_icon.ico w32g_sleep.bmp w32g_subbtn.bmp
+@BORLANDC_TRUE@@VCPP_FALSE@@WATCOM_FALSE@      perl -pe 's/(^FONT.*".*").*$$/$$1/' w32g_res.rc >w32g_res_bc.rc
+@BORLANDC_TRUE@@VCPP_FALSE@@WATCOM_FALSE@      brcc32 -ic:/borland/bcc55/include w32g_res_bc.rc
+@BORLANDC_TRUE@@VCPP_FALSE@@WATCOM_FALSE@      mv w32g_res_bc.RES w32g_res.res
+@BORLANDC_TRUE@@VCPP_FALSE@@WATCOM_FALSE@      rm w32g_res_bc.rc
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@w32g_syn_escaped.c:w32g_syn.c escape_sjis.pl
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     escape_sjis.pl < w32g_syn.c > w32g_syn_escaped.c
+
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@w32g_subwin_escaped.c:w32g_subwin.c escape_sjis.pl
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     escape_sjis.pl < w32g_subwin.c > w32g_subwin_escaped.c
+
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@w32g_res.res: w32g_res.h w32g_rec.h w32g_res.rc \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     w32g_btn.bmp w32g_icon.ico w32g_sleep.bmp w32g_subbtn.bmp \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     escape_sjis.pl
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     escape_sjis.pl <w32g_res.rc >w32g_res_escaped.rc
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     windres -o $@ -O coff w32g_res_escaped.rc
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     rm w32g_res_escaped.rc
 #n_so_libs = @n_so_libs@
 #s_so_libs = @s_so_libs@
 #m_so_libs = @m_so_libs@

diff --git a/interface/bitmaps/Makefile.in b/interface/bitmaps/Makefile.in
index 27b2702..c968d33 100644 (file)
--- a/interface/bitmaps/Makefile.in
+++ b/interface/bitmaps/Makefile.in
@@ -219,6 +219,9 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
 W32READDIR_FALSE = @W32READDIR_FALSE@
 W32READDIR_TRUE = @W32READDIR_TRUE@
+WATCOM_FALSE = @WATCOM_FALSE@
+WATCOM_LDFLAGS = @WATCOM_LDFLAGS@
+WATCOM_TRUE = @WATCOM_TRUE@
 WISH = @WISH@
 W_so_libs = @W_so_libs@
 X_CFLAGS = @X_CFLAGS@

diff --git a/interface/motif_bitmaps/Makefile.in b/interface/motif_bitmaps/Makefile.in
index 7ca7485..bb97d3f 100644 (file)
--- a/interface/motif_bitmaps/Makefile.in
+++ b/interface/motif_bitmaps/Makefile.in
@@ -201,6 +201,9 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
 W32READDIR_FALSE = @W32READDIR_FALSE@
 W32READDIR_TRUE = @W32READDIR_TRUE@
+WATCOM_FALSE = @WATCOM_FALSE@
+WATCOM_LDFLAGS = @WATCOM_LDFLAGS@
+WATCOM_TRUE = @WATCOM_TRUE@
 WISH = @WISH@
 W_so_libs = @W_so_libs@
 X_CFLAGS = @X_CFLAGS@

diff --git a/interface/ncurs_c.c b/interface/ncurs_c.c
index 6009bc4..b0cac5a 100644 (file)
--- a/interface/ncurs_c.c
+++ b/interface/ncurs_c.c
@@ -105,7 +105,7 @@ int PDC_set_ctrl_break(bool setting);
 #endif /* MIDI_TITLE */
 
 #ifdef DISPLAY_MID_MODE
-#ifdef JAPANESE
+#if defined(JAPANESE) && !defined(__WATCOMC__)
 #include "mid-j.defs"
 #else
 #include "mid.defs"

diff --git a/interface/pixmaps/Makefile.in b/interface/pixmaps/Makefile.in
index 040240b..d97f56a 100644 (file)
--- a/interface/pixmaps/Makefile.in
+++ b/interface/pixmaps/Makefile.in
@@ -201,6 +201,9 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
 W32READDIR_FALSE = @W32READDIR_FALSE@
 W32READDIR_TRUE = @W32READDIR_TRUE@
+WATCOM_FALSE = @WATCOM_FALSE@
+WATCOM_LDFLAGS = @WATCOM_LDFLAGS@
+WATCOM_TRUE = @WATCOM_TRUE@
 WISH = @WISH@
 W_so_libs = @W_so_libs@
 X_CFLAGS = @X_CFLAGS@

diff --git a/libarc/Makefile.am b/libarc/Makefile.am
index ce049e7..5584d21 100644 (file)
--- a/libarc/Makefile.am
+++ b/libarc/Makefile.am
@@ -84,11 +84,20 @@ if BORLANDC
        done
        if test -f arc.lib ; then touch $@ ; fi
 else
-       -rm -f libarc.a\r
-       $(libarc_a_AR) libarc.a $(libarc_a_OBJECTS) $(libarc_a_LIBADD)\r
+if WATCOM
+       rm -f libarc.a
+       rm -f arc.lib
+       for foo in $(libarc_a_OBJECTS) $(libarc_a_LIBADD);do \
+         wlib -q arc.lib +$$foo; \
+       done
+       if test -f arc.lib ; then touch $@ ; fi
+else
+       -rm -f libarc.a
+       $(libarc_a_AR) libarc.a $(libarc_a_OBJECTS) $(libarc_a_LIBADD)
        $(RANLIB) libarc.a
 endif
 endif
+endif
 
 clean:
        rm -f *.$(OBJEXT)

diff --git a/libarc/Makefile.in b/libarc/Makefile.in
index 1451469..50896ba 100644 (file)
--- a/libarc/Makefile.in
+++ b/libarc/Makefile.in
@@ -219,6 +219,9 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
 W32READDIR_FALSE = @W32READDIR_FALSE@
 W32READDIR_TRUE = @W32READDIR_TRUE@
+WATCOM_FALSE = @WATCOM_FALSE@
+WATCOM_LDFLAGS = @WATCOM_LDFLAGS@
+WATCOM_TRUE = @WATCOM_TRUE@
 WISH = @WISH@
 W_so_libs = @W_so_libs@
 X_CFLAGS = @X_CFLAGS@
@@ -663,9 +666,15 @@ libarc.a: $(libarc_a_OBJECTS) $(libarc_a_DEPENDENCIES)
 @BORLANDC_TRUE@@VCPP_FALSE@      tlib arc.lib +$$foo; \
 @BORLANDC_TRUE@@VCPP_FALSE@    done
 @BORLANDC_TRUE@@VCPP_FALSE@    if test -f arc.lib ; then touch $@ ; fi
-@BORLANDC_FALSE@@VCPP_FALSE@   -rm -f libarc.a
-@BORLANDC_FALSE@@VCPP_FALSE@   $(libarc_a_AR) libarc.a $(libarc_a_OBJECTS) $(libarc_a_LIBADD)
-@BORLANDC_FALSE@@VCPP_FALSE@   $(RANLIB) libarc.a
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      rm -f libarc.a
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      rm -f arc.lib
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      for foo in $(libarc_a_OBJECTS) $(libarc_a_LIBADD);do \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@        wlib -q arc.lib +$$foo; \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      done
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      if test -f arc.lib ; then touch $@ ; fi
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     -rm -f libarc.a
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     $(libarc_a_AR) libarc.a $(libarc_a_OBJECTS) $(libarc_a_LIBADD)
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     $(RANLIB) libarc.a
 
 clean:
        rm -f *.$(OBJEXT)

diff --git a/libunimod/Makefile.am b/libunimod/Makefile.am
index fd20632..bb5c11b 100644 (file)
--- a/libunimod/Makefile.am
+++ b/libunimod/Makefile.am
@@ -68,11 +68,20 @@ if BORLANDC
        done
        if test -f unimod.lib ; then touch $@ ; fi
 else
-       -rm -f libunimod.a\r
-       $(libunimod_a_AR) libunimod.a $(libunimod_a_OBJECTS) $(libunimod_a_LIBADD)\r
+if WATCOM
+       rm -f libunimod.a
+       rm -f unimod.lib
+       for foo in  $(libunimod_a_OBJECTS);do \
+         wlib -q unimod.lib +$$foo; \
+       done
+       if test -f unimod.lib ; then touch $@ ; fi
+else
+       -rm -f libunimod.a
+       $(libunimod_a_AR) libunimod.a $(libunimod_a_OBJECTS) $(libunimod_a_LIBADD)
        $(RANLIB) libunimod.a
 endif
 endif
+endif
 
 clean:
        rm -f *.$(OBJEXT)

diff --git a/libunimod/Makefile.in b/libunimod/Makefile.in
index c7880e2..f042449 100644 (file)
--- a/libunimod/Makefile.in
+++ b/libunimod/Makefile.in
@@ -219,6 +219,9 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
 W32READDIR_FALSE = @W32READDIR_FALSE@
 W32READDIR_TRUE = @W32READDIR_TRUE@
+WATCOM_FALSE = @WATCOM_FALSE@
+WATCOM_LDFLAGS = @WATCOM_LDFLAGS@
+WATCOM_TRUE = @WATCOM_TRUE@
 WISH = @WISH@
 W_so_libs = @W_so_libs@
 X_CFLAGS = @X_CFLAGS@
@@ -638,9 +641,15 @@ libunimod.a: $(libunimod_a_OBJECTS) $(libunimod_a_DEPENDENCIES)
 @BORLANDC_TRUE@@VCPP_FALSE@      tlib unimod.lib +$$foo; \
 @BORLANDC_TRUE@@VCPP_FALSE@    done
 @BORLANDC_TRUE@@VCPP_FALSE@    if test -f unimod.lib ; then touch $@ ; fi
-@BORLANDC_FALSE@@VCPP_FALSE@   -rm -f libunimod.a
-@BORLANDC_FALSE@@VCPP_FALSE@   $(libunimod_a_AR) libunimod.a $(libunimod_a_OBJECTS) $(libunimod_a_LIBADD)
-@BORLANDC_FALSE@@VCPP_FALSE@   $(RANLIB) libunimod.a
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      rm -f libunimod.a
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      rm -f unimod.lib
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      for foo in  $(libunimod_a_OBJECTS);do \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@        wlib -q unimod.lib +$$foo; \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      done
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      if test -f unimod.lib ; then touch $@ ; fi
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     -rm -f libunimod.a
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     $(libunimod_a_AR) libunimod.a $(libunimod_a_OBJECTS) $(libunimod_a_LIBADD)
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     $(RANLIB) libunimod.a
 
 clean:
        rm -f *.$(OBJEXT)

diff --git a/script/Makefile.in b/script/Makefile.in
index b359322..e4aee72 100644 (file)
--- a/script/Makefile.in
+++ b/script/Makefile.in
@@ -194,6 +194,9 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
 W32READDIR_FALSE = @W32READDIR_FALSE@
 W32READDIR_TRUE = @W32READDIR_TRUE@
+WATCOM_FALSE = @WATCOM_FALSE@
+WATCOM_LDFLAGS = @WATCOM_LDFLAGS@
+WATCOM_TRUE = @WATCOM_TRUE@
 WISH = @WISH@
 W_so_libs = @W_so_libs@
 X_CFLAGS = @X_CFLAGS@

diff --git a/timidity/Makefile.in b/timidity/Makefile.in
index 02eb56a..0778835 100644 (file)
--- a/timidity/Makefile.in
+++ b/timidity/Makefile.in
@@ -219,6 +219,9 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
 W32READDIR_FALSE = @W32READDIR_FALSE@
 W32READDIR_TRUE = @W32READDIR_TRUE@
+WATCOM_FALSE = @WATCOM_FALSE@
+WATCOM_LDFLAGS = @WATCOM_LDFLAGS@
+WATCOM_TRUE = @WATCOM_TRUE@
 WISH = @WISH@
 W_so_libs = @W_so_libs@
 X_CFLAGS = @X_CFLAGS@

diff --git a/utils/Makefile.am b/utils/Makefile.am
index a657b0e..dd2bfa2 100644 (file)
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -96,11 +96,20 @@ if BORLANDC
        done
        if test -f utils.lib ; then touch $@ ; fi
 else
-       -rm -f libutils.a\r
-       $(libutils_a_AR) libutils.a $(libutils_a_OBJECTS) $(libutils_a_LIBADD)\r
+if WATCOM
+       rm -f libutils.a
+       rm -f utils.lib
+       for foo in  $(libutils_a_OBJECTS) $(libutils_a_LIBADD);do \
+       wlib -q utils.lib +$$foo; \
+       done
+       if test -f utils.lib ; then touch $@ ; fi
+else
+       -rm -f libutils.a
+       $(libutils_a_AR) libutils.a $(libutils_a_OBJECTS) $(libutils_a_LIBADD)
        $(RANLIB) libutils.a
 endif
 endif
+endif
 
 clean:
        rm -f *.$(OBJEXT)

diff --git a/utils/Makefile.in b/utils/Makefile.in
index 1ca0b8d..73be2ba 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -219,6 +219,9 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
 W32READDIR_FALSE = @W32READDIR_FALSE@
 W32READDIR_TRUE = @W32READDIR_TRUE@
+WATCOM_FALSE = @WATCOM_FALSE@
+WATCOM_LDFLAGS = @WATCOM_LDFLAGS@
+WATCOM_TRUE = @WATCOM_TRUE@
 WISH = @WISH@
 W_so_libs = @W_so_libs@
 X_CFLAGS = @X_CFLAGS@
@@ -690,9 +693,15 @@ libutils.a: $(libutils_a_OBJECTS) $(libutils_a_DEPENDENCIES)
 @BORLANDC_TRUE@@VCPP_FALSE@      tlib utils.lib +$$foo; \
 @BORLANDC_TRUE@@VCPP_FALSE@    done
 @BORLANDC_TRUE@@VCPP_FALSE@    if test -f utils.lib ; then touch $@ ; fi
-@BORLANDC_FALSE@@VCPP_FALSE@   -rm -f libutils.a
-@BORLANDC_FALSE@@VCPP_FALSE@   $(libutils_a_AR) libutils.a $(libutils_a_OBJECTS) $(libutils_a_LIBADD)
-@BORLANDC_FALSE@@VCPP_FALSE@   $(RANLIB) libutils.a
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      rm -f libutils.a
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      rm -f utils.lib
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      for foo in  $(libutils_a_OBJECTS) $(libutils_a_LIBADD);do \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      wlib -q utils.lib +$$foo; \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      done
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_TRUE@      if test -f utils.lib ; then touch $@ ; fi
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     -rm -f libutils.a
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     $(libutils_a_AR) libutils.a $(libutils_a_OBJECTS) $(libutils_a_LIBADD)
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_FALSE@     $(RANLIB) libutils.a
 
 clean:
        rm -f *.$(OBJEXT)