diff options
| author | Stephen Torri <storri@users.sourceforge.net> | 2003-07-20 20:48:40 +0000 |
|---|---|---|
| committer | Stephen Torri <storri@users.sourceforge.net> | 2003-07-20 20:48:40 +0000 |
| commit | 95e6ebe3d3920ff73bf4fe75c8c6009aa0dae6df (patch) | |
| tree | 1bbad2a168187b0f211386001b9083a13d6b899a | |
| parent | 6d052952bb498a9c0330f69d9e5f50be38c6c4d0 (diff) | |
| download | xine-lib-95e6ebe3d3920ff73bf4fe75c8c6009aa0dae6df.tar.gz xine-lib-95e6ebe3d3920ff73bf4fe75c8c6009aa0dae6df.tar.bz2 | |
Changed assembly building code to take advantage of libtool. This command
now works for libtool-1.4.x and libtool-1.5.
Changed the commands for building the assembly files in libw32dll to
match that suggested by Chris Rankin <rankincj@yahoo.com>.
CVS patchset: 5203
CVS date: 2003/07/20 20:48:40
| -rw-r--r-- | m4/as.m4 | 4 | ||||
| -rw-r--r-- | src/libw32dll/wine/Makefile.am | 9 |
2 files changed, 7 insertions, 6 deletions
@@ -12,9 +12,9 @@ AC_REQUIRE([AC_PROG_CC]) : ${CCASFLAGS='$(CFLAGS)'} # Set ASCOMPILE if not already set. if test $CCAS = '$'CC; then -: ${CCASCOMPILE='$(CCAS) $(AM_ASFLAGS) $(CCASFLAGS) -c'} +: ${CCASCOMPILE='$(LIBTOOL) --mode=compile $(CCAS) $(AM_ASFLAGS) $(CCASFLAGS) -c'} else -: ${CCASCOMPILE='$(CCAS) $(AM_ASFLAGS) $(CCASFLAGS)'} +: ${CCASCOMPILE='$(LIBTOOL) --mode=compile $(CCAS) $(AM_ASFLAGS) $(CCASFLAGS)'} fi AC_SUBST(CCAS) AC_SUBST(CCASFLAGS) diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am index a561ff2d1..47657123c 100644 --- a/src/libw32dll/wine/Makefile.am +++ b/src/libw32dll/wine/Makefile.am @@ -74,8 +74,9 @@ noinst_HEADERS = \ winuser.h \ wrapper.h -stubs.lo: stubs.s - $(CC) -c $(srcdir)/stubs.s -o stubs.lo +%.lo: %.s + $(CCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +%.lo: %.S + $(CCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -wrapper.lo: wrapper.S - $(CC) -c $(srcdir)/wrapper.S -o wrapper.lo |