bcacheadm fixes

[bcachefs-tools-debian] / Makefile

diff --git a/Makefile b/Makefile
index b31e080e4f7d44dbff0978746a6d7946ee0da2dd..cda518757fcbe87765c4951d96786cb9ff45f6bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,42 @@
 
 PREFIX=/usr
-CFLAGS+=-O2 -Wall -g
+UDEVLIBDIR=/lib/udev
+DRACUTLIBDIR=/lib/dracut
+INSTALL=install
+CFLAGS+=-O2 -Wall -Werror -g -I.
 
-all: make-bcache probe-bcache bcache-super-show
+all: bcacheadm make-bcache probe-bcache bcachectl
 
-install: make-bcache probe-bcache bcache-super-show
-       install -m0755 make-bcache bcache-super-show    $(DESTDIR)${PREFIX}/sbin/
-       install -m0755 probe-bcache     $(DESTDIR)/sbin/
-       install -m0644 69-bcache.rules  $(DESTDIR)/lib/udev/rules.d/
-       install -m0755 bcache-register  $(DESTDIR)/lib/udev/
-       -install -T -m0755 initramfs/hook       $(DESTDIR)/usr/share/initramfs-tools/hooks/bcache
-       install -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/
-#      install -m0755 bcache-test $(DESTDIR)${PREFIX}/sbin/
+install: bcacheadm make-bcache probe-bcache
+       $(INSTALL) -m0755 bcacheadm bcachectl $(DESTDIR)${PREFIX}/sbin/
+       $(INSTALL) -m0755 make-bcache bcachectl $(DESTDIR)${PREFIX}/sbin/
+       $(INSTALL) -m0755 probe-bcache bcache-register          $(DESTDIR)$(UDEVLIBDIR)/
+       $(INSTALL) -m0644 69-bcache.rules       $(DESTDIR)$(UDEVLIBDIR)/rules.d/
+       #-$(INSTALL) -T -m0755 initramfs/hook   $(DESTDIR)/usr/share/initramfs-tools/hooks/bcache
+       if [ -d $(DESTDIR)$(DRACUTLIBDIR)/modules.d ]; \
+       then $(INSTALL) -D -m0755 dracut/module-setup.sh $(DESTDIR)$(DRACUTLIBDIR)/modules.d/90bcache/module-setup.sh; \
+       fi
+       $(INSTALL) -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/
+#      $(INSTALL) -m0755 bcache-test $(DESTDIR)${PREFIX}/sbin/
 
 clean:
-       $(RM) -f make-bcache probe-bcache bcache-super-show bcache-test *.o
+       $(RM) -f make-bcache probe-bcache bcache-super-show bcache-test bcachectl *.o
 
 bcache-test: LDLIBS += `pkg-config --libs openssl`
+
+bcacheadm: LDLIBS += `pkg-config --libs uuid blkid libnih`
+bcacheadm: CFLAGS += `pkg-config --cflags uuid blkid libnih`
+bcacheadm: bcache.o
+
 make-bcache: LDLIBS += `pkg-config --libs uuid blkid`
 make-bcache: CFLAGS += `pkg-config --cflags uuid blkid`
 make-bcache: bcache.o
+
 probe-bcache: LDLIBS += `pkg-config --libs uuid blkid`
 probe-bcache: CFLAGS += `pkg-config --cflags uuid blkid`
+
 bcache-super-show: LDLIBS += `pkg-config --libs uuid`
 bcache-super-show: CFLAGS += -std=gnu99
 bcache-super-show: bcache.o
+
+bcachectl: bcachectl.o