diff options
| author | Peter Stuge <peter@stuge.se> | 2011-09-23 13:18:03 +0100 |
|---|---|---|
| committer | Peter Stuge <peter@stuge.se> | 2011-09-23 13:18:03 +0100 |
| commit | fad9572c6bf30689eb3faa6af923b99a55c9166b (patch) | |
| tree | c78bf7ec9bbaa2895ebd54c000c2c73a13a654a5 | |
| parent | 46c8847c0c90f04c6df096c71ad222b318065dda (diff) | |
| download | libusb-fad9572c6bf30689eb3faa6af923b99a55c9166b.tar.gz | |
[autotools] improves "cleaner windres step"
* reverts 3209815810a7e1deb6cb961a4dac01b9cfb64d7d
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | libusb/Makefile.am | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index d5fd62b..a006927 100644 --- a/configure.ac +++ b/configure.ac @@ -29,11 +29,14 @@ AM_MAINTAINER_MODE AC_CONFIG_SRCDIR([libusb/core.c]) AC_CONFIG_MACRO_DIR([m4]) AM_CONFIG_HEADER([config.h]) -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - +# Enable silent build rules by default (Automake v1.11 or later). +# Disable by either passing --disable-silent-rules to configure or passing V=1 to make +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], + [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) AC_PREREQ([2.50]) AC_PROG_CC AC_PROG_LIBTOOL +LT_LANG([Windows Resource]) AC_C_INLINE AM_PROG_CC_C_O AC_DEFINE([_GNU_SOURCE], 1, [Use GNU extensions]) @@ -72,7 +75,6 @@ case $host in *-mingw*) AC_MSG_RESULT([Windows]) backend="windows" - AC_CHECK_TOOL(DLLTOOL, dlltool, false) ;; *-cygwin*) AC_MSG_RESULT([Cygwin (using Windows backend)]) @@ -88,7 +90,6 @@ if test "$backend" = windows; then PC_LIBS_PRIVATE="" AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x500" LTLDFLAGS="${LTLDFLAGS} -avoid-version -Wl,--add-stdcall-alias" - AC_CHECK_TOOL(RC, windres, no) AC_DEFINE([POLL_NFDS_TYPE],[unsigned int],[type of second poll() argument]) fi AC_SUBST(THREAD_CFLAGS) diff --git a/libusb/Makefile.am b/libusb/Makefile.am index 35c10b6..60d9312 100644 --- a/libusb/Makefile.am +++ b/libusb/Makefile.am @@ -25,9 +25,12 @@ endif if OS_WINDOWS OS_SRC = $(WINDOWS_USB_SRC) +pkg_v_rc = $(pkg_v_rc_$(V)) +pkg_v_rc_ = $(pkg_v_rc_$(AM_DEFAULT_VERBOSITY)) +pkg_v_rc_0 = @echo " RC $@"; + .rc.lo: - @echo " WINRES $<" - @$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --silent --mode=compile $(RC) $(RCFLAGS) -I. -i $< -o $@ + $(pkg_v_rc)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=RC --mode=compile $(RC) $(RCFLAGS) -i $< -o $@ endif if THREADS_POSIX |