makefiles: cleanups

daemons/clvmd/Makefile.in

@@ -31,9 +31,9 @@ SALCK_LIBS = @SALCK_LIBS@
 SALCK_CFLAGS = @SALCK_CFLAGS@
 
 SOURCES = \
-	clvmd-command.c  \
-	clvmd.c          \
-	lvm-functions.c  \
+	clvmd-command.c\
+	clvmd.c\
+	lvm-functions.c\
 	refresh_clvmd.c
 
 ifneq (,$(findstring cman,, "@CLVMD@,"))

daemons/dmfilemapd/Makefile.in

@@ -34,9 +34,8 @@ include $(top_builddir)/make.tmpl
 all: device-mapper
 device-mapper: $(TARGETS)
 
-LIBS += -ldevmapper
-
 CFLAGS_dmfilemapd.o += $(EXTRA_EXEC_CFLAGS)
+LIBS += -ldevmapper
 
 dmfilemapd: $(LIB_SHARED) dmfilemapd.o
 	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \

daemons/lvmetad/Makefile.in

@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
 SOURCES = lvmetad-core.c
-SOURCES2 = testclient.c
+SOURCES2 = lvmetactl.c
 
 TARGETS = lvmetad lvmetactl
 

lib/Makefile.in

@@ -48,6 +48,10 @@ ifeq ("@CACHE@", "shared")
   SUBDIRS += cache_segtype
 endif
 
+ifeq ("@CLUSTER@", "shared")
+  SUBDIRS += locking
+endif
+
 SOURCES =\
 	activate/activate.c \
 	cache/lvmcache.c \
@@ -149,10 +153,6 @@ ifeq ("@CLUSTER@", "internal")
   SOURCES += locking/cluster_locking.c
 endif
 
-ifeq ("@CLUSTER@", "shared")
-  SUBDIRS += locking
-endif
-
 ifeq ("@SNAPSHOTS@", "internal")
   SOURCES += snapshot/snapshot.c
 endif