From f2ee1b571db7b40fd99ae8aa6ecc70362cdf773d Mon Sep 17 00:00:00 2001 From: William McBrine Date: Mon, 18 Jun 2007 02:38:06 +0000 Subject: [PATCH] Eliminated the copying of pdcurses.def to cygwin.def -- no longer need to edit the makefile manually. Not tested. --- aclocal.m4 | 2 +- configure | 2 +- x11/Makefile.in | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 4e8272d7..dd7bd809 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -442,7 +442,7 @@ case "$target" in DYN_COMP="-DDYNAMIC" # Only for Rexx/Trans do we produce an import library for the DLL we are # building - LD_RXLIB1="dllwrap --def ./cygwin.def --target i386-cygwin32 --dllname \$(@)" + LD_RXLIB1="dllwrap --def \$(srcdir)/../win32/pdcurses.def --target i386-cygwin32 --dllname \$(@)" LD_RXTRANSLIB1="dllwrap --def \$(srcdir)/\$(basename \$(@))w32.def --output-lib lib\$(basename \$(@)).a --target i386-cygwin32 --dllname \$(@)" # cygwininstall target MUST install the shared library itself because # it puts it into $(bindir) not $(libdir) as all other platforms diff --git a/configure b/configure index 3bb7547f..3e272c31 100755 --- a/configure +++ b/configure @@ -5372,7 +5372,7 @@ case "$target" in DYN_COMP="-DDYNAMIC" # Only for Rexx/Trans do we produce an import library for the DLL we are # building - LD_RXLIB1="dllwrap --def ./cygwin.def --target i386-cygwin32 --dllname \$(@)" + LD_RXLIB1="dllwrap --def \$(srcdir)/../win32/pdcurses.def --target i386-cygwin32 --dllname \$(@)" LD_RXTRANSLIB1="dllwrap --def \$(srcdir)/\$(basename \$(@))w32.def --output-lib lib\$(basename \$(@)).a --target i386-cygwin32 --dllname \$(@)" # cygwininstall target MUST install the shared library itself because # it puts it into $(bindir) not $(libdir) as all other platforms diff --git a/x11/Makefile.in b/x11/Makefile.in index b354bd3e..cae6374e 100644 --- a/x11/Makefile.in +++ b/x11/Makefile.in @@ -88,7 +88,6 @@ $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) -$(RANLIB) $@ $(SHLPRE)$(SHLFILE)$(SHLPST) : $(SHOFILES) -# cp $(srcdir)/../win32/pdcurses.def ./cygwin.def $(LD_RXLIB1) $(RXPACKEXPORTS) -o $@ $(SHOFILES) $(LD_RXLIB2) $(LIBOBJS) $(PDCOBJS) $(SHOFILES) : $(PDCURSES_HEADERS)