Makefile: Some cleanups

Reorder and reformat some arguments so it looks more streamlined during
the build process.

Signed-off-by: Kai Krakow <kai@kaishome.de>

Makefile

@@ -29,7 +29,7 @@ test: lib src
 	$(MAKE) -C test
 
 scripts/%: scripts/%.in
-	sed -e's#@LIBEXEC_PREFIX@#$(LIBEXEC_PREFIX)#' -e's#@PREFIX@#$(PREFIX)#' "$<" >"$@"
+	sed -e's#@LIBEXEC_PREFIX@#$(LIBEXEC_PREFIX)#' -e's#@PREFIX@#$(PREFIX)#' $< >$@
 
 scripts: scripts/beesd scripts/beesd@.service
 

lib/Makefile

@@ -20,7 +20,7 @@ CRUCIBLE_OBJS = \
 	uuid.o \
 	.version.o \
 
-libcrucible.so: $(CRUCIBLE_OBJS)
+libcrucible.so: $(CRUCIBLE_OBJS) -luuid
 
 include ../makeflags
 
@@ -42,4 +42,4 @@ include depends.mk
 	$(CXX) $(CXXFLAGS) -fPIC -o $@ -c $<
 
 %.so:
-	$(CXX) $(LDFLAGS) -fPIC -o $@ $^ -shared -Wl,-soname,$@ -luuid
+	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,-soname,$@ -o $@ $^

src/Makefile

@@ -34,15 +34,14 @@ depends.mk: $(BEES_OBJS:%.o=.depends/%.dep)
 include depends.mk
 
 %.o: %.cc %.h
-	$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+	$(CXX) $(CXXFLAGS) -o $@ -c $<
 
 ../bin/%: %.o
 	@echo Implicit bin rule "$<" '->' "$@"
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBS) -o $@ $<
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
 
 ../bin/bees: $(BEES_OBJS) bees-version.o
-	$(CXX) $(CXXFLAGS) -o "$@" $^ $(LDFLAGS) $(LIBS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 clean:
-	-rm -fv bees-version.h
-	-rm -fv *.o bees-version.c
+	rm -fv *.o bees-version.c

test/Makefile

@@ -28,12 +28,12 @@ depends.mk: $(PROGRAMS:%=.depends/%.dep)
 include depends.mk
 
 %.o: %.cc %.h ../makeflags
-	-echo "Implicit rule %.o: %.cc" >&2
-	$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+	@echo "Implicit rule %.o: %.cc"
+	$(CXX) $(CXXFLAGS) -o $@ -c $<
 
 %: %.o ../makeflags
-	-echo "Implicit rule %: %.o" >&2
-	$(CXX) $(CXXFLAGS) -o "$@" "$<" $(LDFLAGS) $(LIBS)
+	@echo "Implicit rule %: %.o"
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBS) -o $@ $<
 
 clean:
-	-rm -fv *.o
+	rm -fv *.o