diff options
| -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 |