Cleanup, rip out more code, fix compiler warnings

[bcachefs-tools-debian] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 07aff1dc7eb175b5554a9eadd3220cc082afb095..5b3a257b701037676107438ab1080d77b3815803 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,33 +2,21 @@
 AUTOMAKE_OPTIONS=subdir-objects
 
 PREFIX=/usr
-AM_CFLAGS=-O2 -Wall -g -std=gnu99
+AM_CFLAGS=-std=gnu99 -O2 -Wall -Werror -g
 
+bin_PROGRAMS=bcacheadm probe-bcache
 
-bin_PROGRAMS=make-bcache \
-            probe-bcache \
-            bcache-super-show \
-            bcachectl
+bcache.o: CFLAGS += `pkg-config --cflags uuid blkid`
 
-noinst_PROGRAMS=bcache-test
+bcacheadm_SOURCES=bcacheadm.c
+bcacheadm_CFLAGS=$(AM_CFLAGS) `pkg-config --cflags uuid blkid libnih`
+bcacheadm_LDFLAGS=`pkg-config --libs uuid blkid libnih`
+bcacheadm_LDADD=bcache.o
 
-make_bcache_SOURCES=make-bcache.c bcache.c
-make_bcache_LDFLAGS=`pkg-config --libs uuid blkid`
-make_bcache_CFLAGS=$(AM_CFLAGS) `pkg-config --cflags uuid blkid`
-
-probe_bcache_SOURCES=probe-bcache.c bcache.c
-probe_bcache_LDFLAGS=`pkg-config --libs uuid blkid`
+probe_bcache_SOURCES=probe-bcache.c
 probe_bcache_CFLAGS=$(AM_CFLAGS) `pkg-config --cflags uuid blkid`
-
-bcache_super_show_SOURCES=bcache-super-show.c bcache.c
-bcache_super_show_LDFLAGS=`pkg-config --libs uuid`
-bcache_super_show_CFLAGS=$(AM_CFLAGS) `pkg-config --cflags uuid`
-
-bcachectl_SOURCES=bcachectl.c
-
-bcache_test_SOURCE=bcache-test.c
-bcache_test_LDFLAGS=-lm `pkg-config --libs openssl`
-bcache_test_CFLAGS=$(AM_CFLAGS) `pkg-config --cflags openssl`
+probe_bcache_LDFLAGS=`pkg-config --libs uuid blkid`
+probe_bcache_LDADD=bcache.o
 
 udevrule_DATA=69-bcache.rules
 udevruledir=$(prefix)/lib/udev/rules.d
@@ -39,9 +27,7 @@ udevrdir=$(prefix)/lib/udev/
 initramfs_SCRIPTS=initramfs/bcache
 initramfsdir=$(prefix)/etc/initramfs-tools/hooks/
 
-man8_MANS= bcache-super-show.8 \
-          make-bcache.8 \
-          probe-bcache.8
+man8_MANS=bcacheadm.8 probe-bcache.8
 
 include ../../../../../../../../../../usr/share/DateraContainer/Makefile.rpm
 # some version of automake don't like absolute path names for included makefiles