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 4b0e550552318a69788e52002125fa635b4bd700..4525581d2d86716fbf0aebc159d0b475d0719cb4 100644 (file)
--- a/dmapi/src/common/cmd/Makefile
+++ b/dmapi/src/common/cmd/Makefile
@@ -38,7 +38,7 @@ include $(BUILDRULES)
 
 install install-dev: default
 
 
 install install-dev: default
 

-$(TARGETS): $(LLDLIBS)
+$(TARGETS):

        @echo "    [CC]    $@"
        $(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)
 
        @echo "    [CC]    $@"
        $(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)
 

diff --git a/dmapi/src/sample_hsm/Makefile b/dmapi/src/sample_hsm/Makefile
index 7a4ca8c6746fdd94ea4dc76eaedf27b752a71f9a..55df563df3d9fc24ab759904ebb2150b8865206b 100644 (file)
--- a/dmapi/src/sample_hsm/Makefile
+++ b/dmapi/src/sample_hsm/Makefile
@@ -38,7 +38,7 @@ include $(BUILDRULES)
 
 install install-dev: default
 
 
 install install-dev: default
 

-$(TARGETS): $(LLDLIBS)
+$(TARGETS):

        @echo "    [CC]    $@"
        $(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)
 
        @echo "    [CC]    $@"
        $(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)
 

diff --git a/dmapi/src/suite1/cmd/Makefile b/dmapi/src/suite1/cmd/Makefile
index 7e517631468808c00aa840b3a2c790add8ba7736..05dbead7ca30f6dc84771748a786797e84711f8a 100644 (file)
--- a/dmapi/src/suite1/cmd/Makefile
+++ b/dmapi/src/suite1/cmd/Makefile
@@ -61,7 +61,7 @@ include $(BUILDRULES)
 
 install install-dev: default
 
 
 install install-dev: default
 

-$(TARGETS): $(LLDLIBS)
+$(TARGETS):

        @echo "    [CC]    $@"
        $(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)
 
        @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 6b4d0b6cb5efa1b66025205474221206b7824195..c01dff0056fed8ea96626f18ac4fc5e4aa7ebc6c 100644 (file)
--- 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;
        
        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);
        }
                perror(path);
                exit(errno);
        }

diff --git a/dmapi/src/suite2/src/Makefile b/dmapi/src/suite2/src/Makefile
index 91a0f001f0fb74180c6ce52ea9cd9a233b611f2d..c5cf6da9681ed38602a65a7ac8046cbf8fe0fd80 100644 (file)
--- a/dmapi/src/suite2/src/Makefile
+++ b/dmapi/src/suite2/src/Makefile
@@ -44,7 +44,7 @@ include $(BUILDRULES)
 
 install install-dev: default
 
 
 install install-dev: default
 

-$(TARGETS): $(LLDLIBS)
+$(TARGETS):

        @echo "    [CC]    $@"
        $(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)
 
        @echo "    [CC]    $@"
        $(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)