staging: usbip: userspace: cleanup makefiles
Remove unneeded comments; change deprecated flag INCLUDE to AM_CPPFLAGS and put -D option in *_CPPFLAGS; and use "simply expanded variables" in assignments. Signed-off-by: matt mooney <mfm@muteddisk.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
af8bab0639
commit
cd62e07e87
|
@ -1,11 +1,11 @@
|
|||
SUBDIRS = libsrc src
|
||||
includedir=@includedir@/usbip
|
||||
SUBDIRS := libsrc src
|
||||
includedir := @includedir@/usbip
|
||||
include_HEADERS := $(addprefix libsrc/, \
|
||||
usbip.h usbip_common.h vhci_driver.h stub_driver.h)
|
||||
|
||||
dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8 usbip_bind_driver.8)
|
||||
|
||||
if INSTALL_USBIDS
|
||||
pkgdata_DATA = usb.ids
|
||||
EXTRA_DIST = $(pkgdata_DATA)
|
||||
pkgdata_DATA := usb.ids
|
||||
EXTRA_DIST := $(pkgdata_DATA)
|
||||
endif
|
||||
|
|
|
@ -1,10 +1,7 @@
|
|||
# AM_CFLAGS = -Wall -std=gnu99
|
||||
lib_LTLIBRARIES = libusbip.la
|
||||
libusbip_la_SOURCES = names.c names.h stub_driver.c stub_driver.h usbip.h usbip_common.c usbip_common.h vhci_driver.c vhci_driver.h
|
||||
#libusbip_la_SOURCES = names.c names.h stub_driver.c usbip_common.c vhci_driver.c
|
||||
#INCLUDES = -I../include
|
||||
#AM_CPPFLAGS = -I../include -Wall -std=gnu99
|
||||
libusbip_la_LDFLAGS = -version-info 0:1:0
|
||||
EXTRA_CFLAGS = @EXTRA_CFLAGS@
|
||||
libusbip_la_CFLAGS = -Wall -W -Wstrict-prototypes -std=gnu99 $(EXTRA_CFLAGS) -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
|
||||
libusbip_la_CPPFLAGS := -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
|
||||
libusbip_la_CFLAGS := @EXTRA_CFLAGS@ -Wall -W -Wstrict-prototypes -std=gnu99
|
||||
libusbip_la_LDFLAGS := -version-info 0:1:0
|
||||
|
||||
lib_LTLIBRARIES := libusbip.la
|
||||
libusbip_la_SOURCES := names.c names.h stub_driver.c stub_driver.h usbip.h \
|
||||
usbip_common.c usbip_common.h vhci_driver.c vhci_driver.h
|
||||
|
|
|
@ -1,19 +1,10 @@
|
|||
# $Id$
|
||||
AM_CPPFLAGS := -I$(top_srcdir)/libsrc -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
|
||||
AM_CFLAGS := @EXTRA_CFLAGS@ -Wall -W -Wstrict-prototypes -std=gnu99 @PACKAGE_CFLAGS@
|
||||
LDADD := $(top_srcdir)/libsrc/libusbip.la @PACKAGE_LIBS@
|
||||
|
||||
sbin_PROGRAMS = usbip usbipd usbip_bind_driver
|
||||
|
||||
usbip_SOURCES = usbip.c usbip_network.c usbip_network.h
|
||||
usbipd_SOURCES = usbipd.c usbip_network.c usbip_network.h
|
||||
usbip_bind_driver_SOURCES = bind-driver.c \
|
||||
utils.c utils.h \
|
||||
usbip_network.h usbip_network.c
|
||||
|
||||
#usbip_bind_driver_CFLAGS = -Wall -W -Wstrict-prototypes @PACKAGE_CFLAGS@
|
||||
#usbip_bind_driver_LDADD = @PACKAGE_LIBS@
|
||||
|
||||
#AM_CPPFLAGS = -I../include -Wall -std=gnu99
|
||||
INCLUDES = -I$(top_srcdir)/libsrc
|
||||
LDADD = ../libsrc/libusbip.la @PACKAGE_LIBS@
|
||||
EXTRA_CFLAGS = @EXTRA_CFLAGS@
|
||||
AM_CFLAGS = -Wall -W -Wstrict-prototypes -std=gnu99 $(EXTRA_CFLAGS) @PACKAGE_CFLAGS@ -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
|
||||
sbin_PROGRAMS := usbip usbipd usbip_bind_driver
|
||||
|
||||
usbip_SOURCES := usbip.c usbip_network.c usbip_network.h
|
||||
usbipd_SOURCES := usbipd.c usbip_network.c usbip_network.h
|
||||
usbip_bind_driver_SOURCES := bind-driver.c utils.c utils.h \
|
||||
usbip_network.h usbip_network.c
|
||||
|
|
Loading…
Reference in a new issue