From: matt mooney Date: Sat, 14 May 2011 10:55:18 +0000 (-0700) Subject: staging: usbip: userspace: move common cflags to configure.ac X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~17748^2~159 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=be0d54ae39fa5817a70cb002839f9cff6730849a;p=mirror_ubuntu-artful-kernel.git staging: usbip: userspace: move common cflags to configure.ac There are a standard set of cflags that are used in each makefile so let's set those in EXTRA_CFLAGS and enforce them for the entire project. Signed-off-by: matt mooney Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/usbip/userspace/configure.ac b/drivers/staging/usbip/userspace/configure.ac index 7b93d2902258..d5f6d8e87f87 100644 --- a/drivers/staging/usbip/userspace/configure.ac +++ b/drivers/staging/usbip/userspace/configure.ac @@ -18,7 +18,7 @@ LT_INIT # Silent build for automake >= 1.11 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AC_SUBST([EXTRA_CFLAGS]) +AC_SUBST([EXTRA_CFLAGS], ["-Wall -W -Wstrict-prototypes -std=gnu99"]) # Checks for programs. AC_PROG_CC diff --git a/drivers/staging/usbip/userspace/libsrc/Makefile.am b/drivers/staging/usbip/userspace/libsrc/Makefile.am index 6abe7fcd9b35..77ecf6b844b7 100644 --- a/drivers/staging/usbip/userspace/libsrc/Makefile.am +++ b/drivers/staging/usbip/userspace/libsrc/Makefile.am @@ -1,5 +1,5 @@ libusbip_la_CPPFLAGS := -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"' -libusbip_la_CFLAGS := @EXTRA_CFLAGS@ -Wall -W -Wstrict-prototypes -std=gnu99 +libusbip_la_CFLAGS := @EXTRA_CFLAGS@ libusbip_la_LDFLAGS := -version-info @LIBUSBIP_VERSION@ lib_LTLIBRARIES := libusbip.la diff --git a/drivers/staging/usbip/userspace/src/Makefile.am b/drivers/staging/usbip/userspace/src/Makefile.am index a2f0ab2fe420..05a7aa50d42f 100644 --- a/drivers/staging/usbip/userspace/src/Makefile.am +++ b/drivers/staging/usbip/userspace/src/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS := -I$(top_srcdir)/libsrc -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"' -AM_CFLAGS := @EXTRA_CFLAGS@ -Wall -W -Wstrict-prototypes -std=gnu99 @PACKAGE_CFLAGS@ +AM_CFLAGS := @EXTRA_CFLAGS@ @PACKAGE_CFLAGS@ LDADD := $(top_srcdir)/libsrc/libusbip.la @PACKAGE_LIBS@ sbin_PROGRAMS := usbip usbipd usbip_bind_driver