From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 21 Jul 2011 23:52:04 +0000 (-0400)
Subject: dmapi: fix build failure if libdm is provided via -ldm
X-Git-Tag: v1.1.0~29
X-Git-Url: https://git.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=40a566dc898d50dba45e9951bd7a5b502f95af07

dmapi: fix build failure if libdm is provided via -ldm

The value of $(LIBDM) may be a linker specification -ldm, and not a
file.  So it's not OK to add this to the dependency, since make will
then complain that it doesn't know how to make the target -ldm.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/dmapi/src/common/cmd/Makefile b/dmapi/src/common/cmd/Makefile
index 4b0e5505..4525581d 100644
--- a/dmapi/src/common/cmd/Makefile
+++ b/dmapi/src/common/cmd/Makefile
@@ -38,7 +38,7 @@ include $(BUILDRULES)
 
 install install-dev: default
 
-$(TARGETS): $(LLDLIBS)
+$(TARGETS):
 	@echo "    [CC]    $@"
 	$(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)
 
diff --git a/dmapi/src/sample_hsm/Makefile b/dmapi/src/sample_hsm/Makefile
index 7a4ca8c6..55df563d 100644
--- a/dmapi/src/sample_hsm/Makefile
+++ b/dmapi/src/sample_hsm/Makefile
@@ -38,7 +38,7 @@ include $(BUILDRULES)
 
 install install-dev: default
 
-$(TARGETS): $(LLDLIBS)
+$(TARGETS):
 	@echo "    [CC]    $@"
 	$(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)
 
diff --git a/dmapi/src/suite1/cmd/Makefile b/dmapi/src/suite1/cmd/Makefile
index 7e517631..05dbead7 100644
--- a/dmapi/src/suite1/cmd/Makefile
+++ b/dmapi/src/suite1/cmd/Makefile
@@ -61,7 +61,7 @@ include $(BUILDRULES)
 
 install install-dev: default
 
-$(TARGETS): $(LLDLIBS)
+$(TARGETS):
 	@echo "    [CC]    $@"
 	$(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)
 
diff --git a/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c b/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c
index 6b4d0b6c..c01dff00 100644
--- a/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c
+++ b/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c
@@ -69,7 +69,7 @@ xfsctl_punch_hole(
 	xfs_flock64_t   flock;
 	int		fd;
 	
-	if ((fd = open(path, O_RDWR|O_CREAT)) < 0) {
+	if ((fd = open(path, O_RDWR|O_CREAT, 0600)) < 0) {
 		perror(path);
 		exit(errno);
 	}
diff --git a/dmapi/src/suite2/src/Makefile b/dmapi/src/suite2/src/Makefile
index 91a0f001..c5cf6da9 100644
--- a/dmapi/src/suite2/src/Makefile
+++ b/dmapi/src/suite2/src/Makefile
@@ -44,7 +44,7 @@ include $(BUILDRULES)
 
 install install-dev: default
 
-$(TARGETS): $(LLDLIBS)
+$(TARGETS):
 	@echo "    [CC]    $@"
 	$(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)