aboutsummaryrefslogtreecommitdiffstats
path: root/tools/blktap/lib
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-03-17 10:57:59 +0000
committerKeir Fraser <keir.fraser@citrix.com>2008-03-17 10:57:59 +0000
commit2dfb6b6e90758fda888d9baae565140f95cb7986 (patch)
treed9c3e1b53f08ed85d4b13eb6ea3d9007002e0b2e /tools/blktap/lib
parent168c389917eae8b7df0662d1974d6ff7df1d6030 (diff)
downloadxen-2dfb6b6e90758fda888d9baae565140f95cb7986.tar.gz
xen-2dfb6b6e90758fda888d9baae565140f95cb7986.tar.bz2
xen-2dfb6b6e90758fda888d9baae565140f95cb7986.zip
Clean up blktap Makefiles.
Signed-off-by: Bastian Blank <waldi@debian.org>
Diffstat (limited to 'tools/blktap/lib')
-rw-r--r--tools/blktap/lib/Makefile29
1 files changed, 13 insertions, 16 deletions
diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index 70a68f225f..4b3f036ee7 100644
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -5,8 +5,9 @@ MAJOR = 3.0
MINOR = 0
SONAME = libblktap.so.$(MAJOR)
-INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I$(XEN_INCLUDE) $(CFLAGS_libxenstore)
-
+CFLAGS += -I.
+CFLAGS += $(CFLAGS_libxenctrl)
+CFLAGS += $(CFLAGS_libxenstore)
LDFLAGS += $(LDFLAGS_libxenstore)
SRCS :=
@@ -20,23 +21,18 @@ CFLAGS += -D _GNU_SOURCE
# Get gcc to generate the dependencies for us.
CFLAGS += -Wp,-MD,.$(@F).d
-CFLAGS += $(INCLUDES)
DEPS = .*.d
-OBJS = $(patsubst %.c,%.o,$(SRCS))
+OBJS = $(SRCS:.c=.o)
+OBJS_PIC = $(SRCS:.c=.opic)
IBINS :=
LIB = libblktap.a libblktap.so.$(MAJOR).$(MINOR)
.PHONY: all
-all: build
-
-.PHONY: build
-build: libblktap.a
-
-.PHONY: libblktap
-libblktap: libblktap.a
+all: $(LIB)
+.PHONY: install
install: all
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
@@ -45,19 +41,20 @@ install: all
ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so
$(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)
+.PHONY: clean
clean:
rm -rf *.a *.so* *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
-libblktap.a: $(OBJS)
+libblktap.so.$(MAJOR).$(MINOR): $(OBJS_PIC)
$(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
- -L$(XEN_XENSTORE) $(LDFLAGS) \
- -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
+ $(LDFLAGS) -o $@ $^
ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
ln -sf libblktap.so.$(MAJOR) libblktap.so
- $(AR) rc $@ libblktap.so
-.PHONY: TAGS all build clean install libblktap
+libblktap.a: $(OBJS)
+ $(AR) rc $@ $^
+.PHONY: TAGS
TAGS:
etags -t $(SRCS) *.h