diff options
| author | Lee Duncan <lduncan@suse.com> | 2018-11-12 13:10:04 -0800 |
|---|---|---|
| committer | Lee Duncan <lduncan@suse.com> | 2018-11-12 13:10:04 -0800 |
| commit | 623a81123c494f5c69dc6616bd72e838862e2f1f (patch) | |
| tree | 7437c753e2ffeb3ab712c4832f4de6da6c7f681e /libopeniscsiusr | |
| parent | c3d96cf3f3a53f0ec8f6617d46aecf59cdfdc496 (diff) | |
| download | open-iscsi-623a81123c494f5c69dc6616bd72e838862e2f1f.tar.gz | |
Use pkg-config in Makefiles for newer libraries.
These two recently-added libraries can be in different
locations on different distros, so use pkg-config to
added the appropriate actions in the make files.
Diffstat (limited to 'libopeniscsiusr')
| -rw-r--r-- | libopeniscsiusr/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile index bf7c96c..a045a45 100644 --- a/libopeniscsiusr/Makefile +++ b/libopeniscsiusr/Makefile @@ -23,6 +23,8 @@ endif INCLUDE_DIR ?= $(prefix)/include PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig +PKG_CONFIG = /usr/bin/pkg-config + LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr LIBISCSI_USR_VERSION_MAJOR=0 @@ -43,13 +45,17 @@ OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o CFLAGS ?= -O2 -g CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC +CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) + +LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) LIBADD = all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc $(LIBS): $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD) + @echo CFLAGS= $(CFLAGS) + $(CC) $(CFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LDFLAGS) $(LIBADD) ln -sf $@ $(DEVLIB) $(LIBS_MAJOR): $(LIBS) |