[Pkg-iscsi-maintainers] [open-iscsi] 33/48: iscsiuio: Update automake files
Ritesh Raj Sarraf
rrs at moszumanska.debian.org
Wed Aug 20 13:54:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
rrs pushed a commit to branch upstream-mnc
in repository open-iscsi.
commit 91cc9c3a7b6557858d39ad0d1970d18a35ca7cc3
Author: Hannes Reinecke <hare at suse.de>
Date: Wed Jan 29 07:59:47 2014 +0100
iscsiuio: Update automake files
The automake files from iscsiuio are somewhat oldish.
So update them to the current standard.
Signed-off-by: Hannes Reinecke <hare at suse.de>
---
Makefile | 3 +++
iscsiuio/configure.ac | 4 ++--
iscsiuio/src/apps/brcm-iscsi/Makefile.am | 2 +-
iscsiuio/src/apps/dhcpc/Makefile.am | 2 +-
iscsiuio/src/uip/Makefile.am | 2 +-
iscsiuio/src/unix/Makefile.am | 2 +-
iscsiuio/src/unix/libs/Makefile.am | 2 +-
7 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 0b7bb98..88b3529 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,9 @@ utils/open-isns/Makefile: utils/open-isns/configure utils/open-isns/Makefile.in
iscsiuio/Makefile: iscsiuio/configure iscsiuio/Makefile.in
cd iscsiuio; ./configure
+iscsiuio/configure iscsiuio/Makefile.in: iscsiuio/configure.ac iscsiuio/Makefile.am
+ cd iscsiuio; autoreconf --install
+
kernel: force
$(MAKE) -C kernel
@echo "Kernel Compilation complete Output file"
diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac
index 381b94d..4faee9e 100644
--- a/iscsiuio/configure.ac
+++ b/iscsiuio/configure.ac
@@ -13,9 +13,9 @@ dnl
PACKAGE=iscsiuio
VERSION=0.7.8.2
-AC_INIT(iscsiuio, 0.7.8.2, eddie.wai at broadcom.com)
+AC_INIT([iscsiuio], [0.7.8.2], [eddie.wai at broadcom.com])
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_INIT_AUTOMAKE
AC_CONFIG_HEADER(config.h)
AC_PATH_PROGS(BASH, bash)
diff --git a/iscsiuio/src/apps/brcm-iscsi/Makefile.am b/iscsiuio/src/apps/brcm-iscsi/Makefile.am
index fb4d661..00cbd8e 100644
--- a/iscsiuio/src/apps/brcm-iscsi/Makefile.am
+++ b/iscsiuio/src/apps/brcm-iscsi/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I${top_srcdir}/src/unix \
+AM_CFLAGS = -I${top_srcdir}/src/unix \
-I${top_srcdir}/src/uip \
-I${top_srcdir}/src/apps/dhcpc \
-I${top_srcdir}/src/apps/brcm-iscsi \
diff --git a/iscsiuio/src/apps/dhcpc/Makefile.am b/iscsiuio/src/apps/dhcpc/Makefile.am
index b8a7bbf..1c97993 100644
--- a/iscsiuio/src/apps/dhcpc/Makefile.am
+++ b/iscsiuio/src/apps/dhcpc/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I${top_srcdir}/src/unix \
+AM_CFLAGS = -I${top_srcdir}/src/unix \
-I${top_srcdir}/src/uip \
-I${top_srcdir}/src/apps/dhcpc \
-I${top_srcdir}/src/apps/brcm-iscsi \
diff --git a/iscsiuio/src/uip/Makefile.am b/iscsiuio/src/uip/Makefile.am
index 2d20573..65c1286 100644
--- a/iscsiuio/src/uip/Makefile.am
+++ b/iscsiuio/src/uip/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I${top_srcdir}/src/unix \
+AM_CFLAGS = -I${top_srcdir}/src/unix \
-I${top_srcdir}/src/apps/dhcpc \
-I${top_srcdir}/src/apps/brcm-iscsi \
-I${top_srcdir}/../include \
diff --git a/iscsiuio/src/unix/Makefile.am b/iscsiuio/src/unix/Makefile.am
index ef853a7..898691d 100644
--- a/iscsiuio/src/unix/Makefile.am
+++ b/iscsiuio/src/unix/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS= libs
-INCLUDES = -I${top_srcdir}/src/uip \
+AM_CFLAGS = -I${top_srcdir}/src/uip \
-I${top_srcdir}/src/apps/brcm-iscsi \
-I${top_srcdir}/src/apps/dhcpc \
-I${top_srcdir}/src/unix/libs \
diff --git a/iscsiuio/src/unix/libs/Makefile.am b/iscsiuio/src/unix/libs/Makefile.am
index 19a1323..890415f 100644
--- a/iscsiuio/src/unix/libs/Makefile.am
+++ b/iscsiuio/src/unix/libs/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I${top_srcdir}/src/uip \
+AM_CFLAGS = -I${top_srcdir}/src/uip \
-I${top_srcdir}/src/unix \
-I${top_srcdir}/src/unix/libs \
-I${top_srcdir}/src/apps/dhcpc \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-iscsi/open-iscsi.git
More information about the Pkg-iscsi-maintainers
mailing list