OSDN Git Service

auto genarated files by autotools
authorKeishi Suenaga <s_keishi@mutt.freemail.ne.jp>
Fri, 13 Jan 2006 12:08:16 +0000 (12:08 +0000)
committerKeishi Suenaga <s_keishi@mutt.freemail.ne.jp>
Fri, 13 Jan 2006 12:08:16 +0000 (12:08 +0000)
configure timidity/Makefile.in windrv/Makefile.in

configure
timidity/Makefile.in

index d4356d5..b5a4020 100755 (executable)
--- a/configure
+++ b/configure
@@ -4400,7 +4400,8 @@ case "$target" in
         ;;
       "xwcc386_w.sh "*)
          WATCOM_C=yes
-         CFLAGS="$CFLAGS -br -5s -zk0 -bm -zp=16 -w=4 -D_WINDOWS -DWIN32 -DINCLUDE_WINDOWS_H"
+         CFLAGS="$CFLAGS -br -bm -5s -zk0 -zp=16 -w=4 -D_WINDOWS -DWIN32 -DINCLUDE_WINDOWS_H"
+         DLLFLAG=" "
          WATCOM_LDFLAGS=
          EXTRALIBS="$EXTRALIBS kernel32.lib winspool.lib comdlg32.lib advapi32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib user32.lib shell32.lib"
          ;;
@@ -19155,9 +19156,9 @@ esac
 if test "${enable_windrv+set}" = set; then
   enableval="$enable_windrv"
    if test "$enableval" = "yes"; then
-      if test "x$VCPP" != "xyes" && test "x$MINGWGCC" != "xyes"  ; then
-       { { echo "$as_me:$LINENO: error: windrv: Only Support VC++ or Mingw Compiler" >&5
-echo "$as_me: error: windrv: Only Support VC++ or Mingw Compiler" >&2;}
+      if test "x$VCPP" != "xyes" && test "x$MINGWGCC" != "xyes" && test "x$BORLANDC" != "xyes" && test "x$WATCOM_C" != "xyes"; then
+       { { echo "$as_me:$LINENO: error: windrv: Only Support VC++ or Mingw or Borland C or Open Watcom" >&5
+echo "$as_me: error: windrv: Only Support VC++ or Mingw or Borland C or Open Watcom" >&2;}
    { (exit 1); exit 1; }; }
          elif test "x$WINSYN" != "xyes"; then
        { { echo "$as_me:$LINENO: error: windrv: Driver must have winsyn interface" >&5
@@ -19170,7 +19171,8 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
     WINDRV=yes
-    CFLAGS="$CFLAGS -DANOTHER_MAIN "
+    if test "x$WATCOM_C" = "xyes"; then DLLFLAG="-bd" ;fi
+    CFLAGS="$CFLAGS $DLLFLAG -DANOTHER_MAIN "
       fi
     fi
 fi;
index d908828..c4c7fef 100644 (file)
@@ -662,7 +662,7 @@ calcnewt_SOURCES = calcnewt.c
 @VCPP_TRUE@@WINDRV_FALSE@VC_LINK = link.exe
 @VCPP_TRUE@@WINDRV_TRUE@VC_LINK = link.exe -lib
 @VCPP_TRUE@VCC_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@BORLANDC_TRUE@@VCPP_FALSE@BORLANDC_LINK = ilink32.exe -C -Gn
+@BORLANDC_TRUE@@VCPP_FALSE@@WINDRV_FALSE@BORLANDC_LINK = ilink32.exe -C -Gn
 @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@WATCOM_LINK = wlink.exe 
 all: all-am
 
@@ -1012,17 +1012,27 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 @VCPP_TRUE@    @rm -f calcnewt$(EXEEXT)
 @VCPP_TRUE@    $(VCC_LINK) $(calcnewt_LDFLAGS) $(calcnewt_OBJECTS) $(calcnewt_LDADD) $(LIBS)
 
-@BORLANDC_TRUE@@VCPP_FALSE@timidity$(EXEEXT): $(timidity_OBJECTS) $(SYSEXTRAS:.c=.$(OBJEXT)) $(timidity_dep) $(W32GUI_RES)
-@BORLANDC_TRUE@@VCPP_FALSE@    @rm -f timidity$(EXEEXT)
-@BORLANDC_TRUE@@VCPP_FALSE@    $(BORLANDC_LINK) $(BORLANDC_LINK_OPTIONS) $(BORLANDC_START) $(timidity_OBJECTS) $(SYSEXTRAS:.c=.$(OBJEXT)), $@, ,$(timidity_LDADD) $(BORLANDC_LDFLAGS) $(LIBS), ,$(W32GUI_RES)
+@BORLANDC_TRUE@@VCPP_FALSE@@WINDRV_TRUE@timidity$(EXEEXT): $(timidity_OBJECTS) $(SYSEXTRAS:.c=.$(OBJEXT)) $(timidity_dep) $(W32GUI_RES)
+@BORLANDC_TRUE@@VCPP_FALSE@@WINDRV_TRUE@       @rm -f $@
+@BORLANDC_TRUE@@VCPP_FALSE@@WINDRV_TRUE@       for foo in $(timidity_OBJECTS) $(SYSEXTRAS:.c=.$(OBJEXT)) ;do  \
+@BORLANDC_TRUE@@VCPP_FALSE@@WINDRV_TRUE@         tlib $@ +$$foo ; \
+@BORLANDC_TRUE@@VCPP_FALSE@@WINDRV_TRUE@       done
+@BORLANDC_TRUE@@VCPP_FALSE@@WINDRV_FALSE@timidity$(EXEEXT): $(timidity_OBJECTS) $(SYSEXTRAS:.c=.$(OBJEXT)) $(timidity_dep) $(W32GUI_RES)
+@BORLANDC_TRUE@@VCPP_FALSE@@WINDRV_FALSE@      @rm -f timidity$(EXEEXT)
+@BORLANDC_TRUE@@VCPP_FALSE@@WINDRV_FALSE@      $(BORLANDC_LINK) $(BORLANDC_LINK_OPTIONS) $(BORLANDC_START) $(timidity_OBJECTS) $(SYSEXTRAS:.c=.$(OBJEXT)), $@, ,$(timidity_LDADD) $(BORLANDC_LDFLAGS) $(LIBS), ,$(W32GUI_RES)
 @BORLANDC_TRUE@@VCPP_FALSE@calcnewt.$(OBJEXT): calcnewt.c
 @BORLANDC_TRUE@@VCPP_FALSE@    $(CC)  -tWC  -c calcnewt.c
 @BORLANDC_TRUE@@VCPP_FALSE@calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES)
 @BORLANDC_TRUE@@VCPP_FALSE@    @rm -f calcnewt$(EXEEXT)
 @BORLANDC_TRUE@@VCPP_FALSE@    $(CCLD) $(calcnewt_LDFLAGS) $(calcnewt_OBJECTS) $(calcnewt_LDADD) $(LIBS)
-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity$(EXEEXT): $(timidity_OBJECTS) $(SYSEXTRAS:.c=.$(OBJEXT)) $(timidity_dep) $(W32GUI_RES)
-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@    @rm -f timidity$(EXEEXT)
-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@    $(WATCOM_LINK) $(WATCOM_LDFLAGS) `for foo in $(timidity_OBJECTS) $(SYSEXTRAS:.c=.$(OBJEXT)); do echo "File $$foo "; done;` Name $@ `for foo in  $(timidity_LDADD) $(LIBS); do echo "Library $$foo"; done;` $(WATCOM_LINK_OPTIONS)  `if test x$(W32GUI_RES) != x ; then  echo Option RESource=$(W32GUI_RES); fi;`
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@@WINDRV_TRUE@timidity$(EXEEXT): $(timidity_OBJECTS) $(SYSEXTRAS:.c=.$(OBJEXT)) $(timidity_dep) $(W32GUI_RES)
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@@WINDRV_TRUE@       @rm -f $@
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@@WINDRV_TRUE@       for foo in $(timidity_OBJECTS) $(SYSEXTRAS:.c=.$(OBJEXT)) ;do  \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@@WINDRV_TRUE@         wlib $@ +$$foo ; \
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@@WINDRV_TRUE@       done
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@@WINDRV_FALSE@timidity$(EXEEXT): $(timidity_OBJECTS) $(SYSEXTRAS:.c=.$(OBJEXT)) $(timidity_dep) $(W32GUI_RES)
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@@WINDRV_FALSE@      @rm -f timidity$(EXEEXT)
+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@@WINDRV_FALSE@      $(WATCOM_LINK) $(WATCOM_LDFLAGS) `for foo in $(timidity_OBJECTS) $(SYSEXTRAS:.c=.$(OBJEXT)); do echo "File $$foo "; done;` Name $@ `for foo in  $(timidity_LDADD) $(LIBS); do echo "Library $$foo"; done;` $(WATCOM_LINK_OPTIONS)  `if test x$(W32GUI_RES) != x ; then  echo Option RESource=$(W32GUI_RES); fi;`
 @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@calcnewt.$(OBJEXT): calcnewt.c
 @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@    $(CCLD)  -c calcnewt.c
 @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES)