Merge tag 'upstream/3.14'

[debian/elilo] / fs / Makefile

diff --git a/fs/Makefile b/fs/Makefile
index 4c26f713ea9f4563b77916605c276eadb088ac94..8e422b21258f46a209ed25e60fa7c9700e85abda 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -23,15 +23,10 @@
 # to use this program.
 #
 
-SRCDIR = .
-
-VPATH = $(SRCDIR)
-
-include $(SRCDIR)/../Make.defaults
-include $(SRCDIR)/../Make.rules
-
-TOPDIR=$(SRCDIR)/..
+include ../Make.defaults
+include ../Make.rules
 
+TOPDIR=$(CDIR)/..
 
 FILES=
 ifeq ($(CONFIG_localfs),y)
@@ -59,17 +54,13 @@ all: $(TARGET)
 # XXX: does not trigger recompile when changing filesystem selection
 #      without doing make clean.
 #
-$(TARGET): check-filesystems $(TOPDIR)/Make.defaults $(FILES)
-       $(LD) $(LD3264) -r -o $@ $(FILES)
-
-clean:
-       $(RM) -f $(TARGET) $(FILES)
-
-check-filesystems:
-       @if [ -n "$(FILES)" ]; then \
-               exit 0; \
-       else \
+$(TARGET): $(TOPDIR)/Make.defaults $(FILES)
+       @if [ -z "$(FILES)" ]; then \
                echo "You need to define at least one filesystem in Make.defaults"; \
                exit 1; \
        fi
+       $(LD) -r -o $@ $(FILES)
+
+clean:
+       $(RM) -f $(TARGET) $(FILES)