From 65d3597c1b8e53374680b2cba1772e2441ce22aa Mon Sep 17 00:00:00 2001
From: Ronnie Sahlberg <sahlberg@localhost>
Date: Sat, 22 Mar 2014 11:23:48 -0700
Subject: [PATCH] AUTOTOOLS: Create Makefile.am for lib

---
 Makefile.am     | 22 +---------------------
 configure.ac    |  1 +
 lib/Makefile.am | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 lib/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c58b8bf..71db261 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # Generic definitions
-SUBDIRS = doc
+SUBDIRS = lib doc
 
 CLEANFILES=
 ACLOCAL_AMFLAGS =-I m4
@@ -32,28 +32,8 @@ EXTRA_PROGRAMS =
 iscsi_includedir = $(includedir)/iscsi
 dist_iscsi_include_HEADERS = include/iscsi.h include/scsi-lowlevel.h
 dist_noinst_HEADERS = include/iscsi-private.h include/md5.h include/slist.h
-dist_noinst_DATA = lib/libiscsi.syms
-
-lib_LTLIBRARIES = lib/libiscsi.la
-lib_libiscsi_la_SOURCES = \
-	lib/connect.c lib/crc32c.c lib/discovery.c lib/init.c \
-	lib/login.c lib/nop.c lib/pdu.c lib/iscsi-command.c \
-	lib/scsi-lowlevel.c lib/socket.c lib/sync.c lib/task_mgmt.c \
-	lib/logging.c
-
-if !HAVE_LIBGCRYPT
-lib_libiscsi_la_SOURCES += lib/md5.c
-endif
-
-SOCURRENT=3
-SOREVISON=10
-SOAGE=0
-lib_libiscsi_la_LDFLAGS = \
-	-version-info $(SOCURRENT):$(SOREVISON):$(SOAGE) -bindir $(bindir) -no-undefined \
-	-export-symbols $(srcdir)/lib/libiscsi.syms
 
 # libiscsi utilities
-
 bin_PROGRAMS += bin/iscsi-inq bin/iscsi-ls bin/iscsi-readcapacity16 \
 	bin/iscsi-swp
 bin_iscsi_inq_SOURCES = src/iscsi-inq.c
diff --git a/configure.ac b/configure.ac
index 4b3052b..c02ed12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,7 @@ AC_CHECK_MEMBER([struct CU_SuiteInfo.pSetUpFunc],
 
 
 AC_CONFIG_FILES([Makefile]
+		[lib/Makefile]
 		[doc/Makefile]
 		[libiscsi.pc])
 AC_OUTPUT
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 0000000..cfcbce1
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,27 @@
+lib_LTLIBRARIES = libiscsi.la
+
+libiscsi_la_SOURCES = \
+	connect.c crc32c.c discovery.c init.c \
+	login.c nop.c pdu.c iscsi-command.c \
+	scsi-lowlevel.c socket.c sync.c task_mgmt.c \
+	logging.c
+
+if !HAVE_LIBGCRYPT
+libiscsi_la_SOURCES += md5.c
+endif
+
+SOCURRENT=3
+SOREVISON=10
+SOAGE=0
+libiscsi_la_LDFLAGS = \
+	-version-info $(SOCURRENT):$(SOREVISON):$(SOAGE) -bindir $(bindir) \
+	-no-undefined -export-symbols libiscsi.syms
+
+libiscsi_la_CPPFLAGS = -I../include -I$(srcdir)/include \
+	"-D_U_=__attribute__((unused))" \
+	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
+
+AM_CFLAGS=$(WARN_CFLAGS)
+
+dist_noinst_DATA = libiscsi.syms
+