diff options
-rw-r--r-- | iscsiuio/configure.ac | 2 | ||||
-rw-r--r-- | iscsiuio/src/unix/Makefile.am | 5 | ||||
-rw-r--r-- | libopeniscsiusr/Makefile | 8 | ||||
-rw-r--r-- | usr/Makefile | 4 | ||||
-rw-r--r-- | usr/fwparam_ibft/Makefile | 4 | ||||
-rw-r--r-- | utils/Makefile | 2 | ||||
-rw-r--r-- | utils/sysdeps/Makefile | 4 |
7 files changed, 15 insertions, 14 deletions
diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac index 9b85448..c53bd27 100644 --- a/iscsiuio/configure.ac +++ b/iscsiuio/configure.ac @@ -72,7 +72,7 @@ AC_ARG_WITH([systemd], *) AC_MSG_ERROR([bad value $withval for --with-systemd]) ;; esac],[with_libsystemd=auto]) AS_IF([test "$with_libsystemd" != no],[ - PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LDFLAGS=$LIBSYSTEMD_LIBS],[ + PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LIBS="${LIBS} $LIBSYSTEMD_LIBS"],[ if test "$with_libsystemd" = yes; then AC_MSG_ERROR([could not find libsystemd using pkg-config]) else diff --git a/iscsiuio/src/unix/Makefile.am b/iscsiuio/src/unix/Makefile.am index a989ef0..8a94371 100644 --- a/iscsiuio/src/unix/Makefile.am +++ b/iscsiuio/src/unix/Makefile.am @@ -27,13 +27,14 @@ iscsiuio_CFLAGS = $(AM_CFLAGS) \ $(LIBNL_CFLAGS) \ -DBYTE_ORDER=@ENDIAN@ -iscsiuio_LDFLAGS= $(AM_LDADD) \ +iscsiuio_LIBS = $(AM_LIBS) \ -ldl \ -rdynamic \ $(LIBNL_LIBS) \ -lpthread -iscsiuio_LDADD = ${top_srcdir}/src/uip/lib_iscsi_uip.a \ +iscsiuio_LDADD = $(AM_LDADD) \ + ${top_srcdir}/src/uip/lib_iscsi_uip.a \ ${top_srcdir}/src/apps/dhcpc/lib_apps_dhcpc.a\ ${top_srcdir}/src/apps/brcm-iscsi/lib_apps_brcm_iscsi.a \ ${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile index f96bf02..52e453a 100644 --- a/libopeniscsiusr/Makefile +++ b/libopeniscsiusr/Makefile @@ -28,8 +28,8 @@ INCLUDE_DIR ?= $(prefix)/include PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig MAN_DIR = $(prefix)/share/man -PKG_CONFIG = /usr/bin/pkg-config -SED = /usr/bin/sed +PKG_CONFIG ?= /usr/bin/pkg-config +SED ?= /usr/bin/sed LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr @@ -97,7 +97,7 @@ install_docs: doc install_pkg_files: $(INSTALL) -m 644 -D $(PKGFILE).in $(DESTDIR)$(PKGCONF_DIR)/$(PKGFILE) - perl -i -pe 's|__VERSION__|$(LIBNVME_VERSION)|g' \ + perl -i -pe 's|__VERSION__|$(LIBISCSI_USR_VERSION)|g' \ $(DESTDIR)$(PKGCONF_DIR)/$(PKGFILE) perl -i -pe 's|__LIB_DIR__|$(LIB_DIR)|g' \ $(DESTDIR)$(PKGCONF_DIR)/$(PKGFILE) @@ -116,7 +116,7 @@ docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS) perl docs/doc-preclean.pl > "$(TEMPFILE)" perl docs/kernel-doc -man "$(TEMPFILE)" | \ perl docs/split-man.pl docs/man - -rm -f "$(TEMPFILE)" + -$(RM) "$(TEMPFILE)" @for file in docs/man/*.3; do \ gzip -f $$file; \ done diff --git a/usr/Makefile b/usr/Makefile index 8f91ee1..3fc2248 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -41,7 +41,7 @@ endif DBROOT ?= $(etcdir)/iscsi HOMEDIR ?= $(etcdir)/iscsi -PKG_CONFIG = /usr/bin/pkg-config +PKG_CONFIG ?= /usr/bin/pkg-config CFLAGS ?= -O2 -g WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common @@ -121,7 +121,7 @@ clean: $(MAKE) $(MFLAGS) -C $(FW_BOOT_DIR) clean depend: - gcc $(CFLAGS) -M `ls *.c` > .depend + $(CC) $(CFLAGS) -M `ls *.c` > .depend $(MAKE) $(MFLAGS) -C $(FW_BOOT_DIR) depend -include .depend diff --git a/usr/fwparam_ibft/Makefile b/usr/fwparam_ibft/Makefile index 6739f41..768b573 100644 --- a/usr/fwparam_ibft/Makefile +++ b/usr/fwparam_ibft/Makefile @@ -42,11 +42,11 @@ LDFLAGS += -L$(TOPDIR)/libopeniscsiusr -liscsiusr all: $(OBJS) clean: - rm -f $(CLEANFILES) .depend + $(RM) $(CLEANFILES) .depend $(OBJS): prom_parse.tab.h prom_parse.h depend: - gcc $(CFLAGS) -M `ls *.c` > .depend + $(CC) $(CFLAGS) -M `ls *.c` > .depend -include .depend diff --git a/utils/Makefile b/utils/Makefile index e32b4e6..a7eb352 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -73,6 +73,6 @@ clean: $(RM) .depend depend: - gcc $(CFLAGS) -M `ls *.c` > .depend + $(CC) $(CFLAGS) -M `ls *.c` > .depend -include .depend diff --git a/utils/sysdeps/Makefile b/utils/sysdeps/Makefile index 4299164..3387b57 100644 --- a/utils/sysdeps/Makefile +++ b/utils/sysdeps/Makefile @@ -8,9 +8,9 @@ SYSDEPS_OBJS=sysdeps.o all: $(SYSDEPS_OBJS) clean: - rm -f *.o .depend + $(RM) *.o .depend depend: - gcc $(CFLAGS) -M `ls *.c` > .depend + $(CC) $(CFLAGS) -M `ls *.c` > .depend -include .depend |