admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #352 from orbea/automake

Browse Source 
Makefile.am improvements
This commit is contained in:
Bart Van Assche
2021-05-23 09:22:07 -07:00
committed by GitHub
parent 4072e608c1 c437afa825
commit 4ea2bc6acb
6 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@@ -15,7 +15,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" \ AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" \
"-D_R_(A,B)=__attribute__((format(printf,A,B)))" "-D_R_(A,B)=__attribute__((format(printf,A,B)))"
AM_CFLAGS=$(WARN_CFLAGS) AM_CFLAGS=$(WARN_CFLAGS)
LDADD = lib/libiscsi.la
EXTRA_DIST = autogen.sh COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt \ EXTRA_DIST = autogen.sh COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt \
packaging/RPM/libiscsi.spec.in packaging/RPM/makerpms.sh \ packaging/RPM/libiscsi.spec.in packaging/RPM/makerpms.sh \

3
examples/Makefile.am
View File

@@ -1,6 +1,7 @@
AM_CPPFLAGS=-I. -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ AM_CPPFLAGS=-I. -I${srcdir}/../include "-D_U_=__attribute__((unused))" \
"-D_R_(A,B)=__attribute__((format(printf,A,B)))" "-D_R_(A,B)=__attribute__((format(printf,A,B)))"
AM_CFLAGS=$(WARN_CFLAGS) AM_CFLAGS=$(WARN_CFLAGS)
LDADD = ../lib/libiscsi.la AM_LDFLAGS=-no-undefined
LIBS=../lib/libiscsi.la
noinst_PROGRAMS = iscsiclient iscsi-dd noinst_PROGRAMS = iscsiclient iscsi-dd

4
lib/Makefile.am
View File

@@ -17,9 +17,11 @@ libiscsipriv_la_SOURCES += iser.c
endif endif
if HAVE_LINUX_ISER if HAVE_LINUX_ISER
libiscsipriv_la_LDFLAGS = -libverbs -lrdmacm -lpthread libiscsipriv_la_LIBADD = -libverbs -lrdmacm -lpthread
endif endif
libiscsipriv_la_LDFLAGS = -no-undefined
libiscsipriv_la_CPPFLAGS = -I${srcdir}/../include -I$(srcdir)/include \ libiscsipriv_la_CPPFLAGS = -I${srcdir}/../include -I$(srcdir)/include \
"-D_U_=__attribute__((unused))" \ "-D_U_=__attribute__((unused))" \
"-D_R_(A,B)=__attribute__((format(printf,A,B)))" "-D_R_(A,B)=__attribute__((format(printf,A,B)))"

5
test-tool/Makefile.am
View File

@@ -2,7 +2,8 @@ AM_CPPFLAGS=-I. -I${srcdir}/../include \
"-D_U_=__attribute__((unused)) " \ "-D_U_=__attribute__((unused)) " \
"-D_R_(A,B)=__attribute__((format(printf,A,B)))" "-D_R_(A,B)=__attribute__((format(printf,A,B)))"
AM_CFLAGS=$(WARN_CFLAGS) AM_CFLAGS=$(WARN_CFLAGS)
LDADD = ../lib/libiscsipriv.la AM_LDFLAGS=-no-undefined
LIBS = ../lib/libiscsipriv.la
EXTRA_DIST = README EXTRA_DIST = README
@@ -13,7 +14,7 @@ dist_noinst_HEADERS = iscsi-support.h \
# libiscsi test tool using cunit # libiscsi test tool using cunit
if ISCSITEST if ISCSITEST
bin_PROGRAMS = iscsi-test-cu bin_PROGRAMS = iscsi-test-cu
iscsi_test_cu_LDFLAGS = -ldl -lcunit iscsi_test_cu_LDADD = -ldl -lcunit
iscsi_test_cu_SOURCES = iscsi-test-cu.c \ iscsi_test_cu_SOURCES = iscsi-test-cu.c \
iscsi-support.c \ iscsi-support.c \
iscsi-multipath.c \ iscsi-multipath.c \

3
tests/Makefile.am
View File

@@ -1,7 +1,8 @@
AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \
"-D_R_(A,B)=__attribute__((format(printf,A,B)))" "-D_R_(A,B)=__attribute__((format(printf,A,B)))"
AM_CFLAGS = $(WARN_CFLAGS) AM_CFLAGS = $(WARN_CFLAGS)
LDADD = ../lib/libiscsi.la AM_LDFLAGS = -no-undefined
LIBS = ../lib/libiscsi.la
noinst_PROGRAMS = prog_reconnect prog_reconnect_timeout prog_noop_reply \ noinst_PROGRAMS = prog_reconnect prog_reconnect_timeout prog_noop_reply \
prog_readwrite_iov prog_timeout prog_read_all_pdus \ prog_readwrite_iov prog_timeout prog_read_all_pdus \

3
utils/Makefile.am
View File

@@ -1,7 +1,8 @@
AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \
"-D_R_(A,B)=__attribute__((format(printf,A,B)))" "-D_R_(A,B)=__attribute__((format(printf,A,B)))"
AM_CFLAGS = $(WARN_CFLAGS) AM_CFLAGS = $(WARN_CFLAGS)
LDADD = ../lib/libiscsi.la AM_LDFLAGS = -no-undefined
LIBS = ../lib/libiscsi.la
bin_PROGRAMS = iscsi-inq iscsi-ls iscsi-perf iscsi-readcapacity16 \ bin_PROGRAMS = iscsi-inq iscsi-ls iscsi-perf iscsi-readcapacity16 \
iscsi-swp iscsi-swp