diff mbox

[04/13] vis: Directly specify objects in Makefile

Message ID 1305985517-3763-4-git-send-email-sven@narfation.org (mailing list archive)
State Accepted, archived
Commit cd172b63a7794eb2947853952a0b2b3eb3d60542
Headers

Commit Message

Sven Eckelmann May 21, 2011, 1:45 p.m. UTC 
  The information about header and source files aren't needed by the
Makefile. Only the dependencies to headers provide useful information,
but these are automatically included by the generated *.d files.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
This patch depends on other patches submitted earlier:
 - vis: Remove obsolete creation of source packages
 - vis: Remove subversion/svk revision information

 Makefile |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)
diff mbox

Patch

diff --git a/Makefile b/Makefile
index f7bcef9..a18aa72 100644
--- a/Makefile
+++ b/Makefile
@@ -32,9 +32,8 @@  LDFLAGS +=	-lpthread
 
 SBINDIR =	$(INSTALL_PREFIX)/usr/sbin
 
-SRC_C= allocate.c hash.c list-batman.c vis.c udp_server.c
-SRC_H= allocate.h hash.h list-batman.h vis.h vis-types.h
-SRC_O= $(SRC_C:.c=.o)
+OBJ = allocate.o hash.o list-batman.o vis.o udp_server.o
+DEP = $(OBJ:.o=.d)
 
 BINARY_NAME= vis
 
@@ -45,16 +44,15 @@  REVISION_VERSION=\"\ $(REVISION)\"
 
 all: $(BINARY_NAME)
 
-$(BINARY_NAME):	$(SRC_O) $(SRC_H) Makefile
-	$(Q_LD)$(CC) -o $@ $(SRC_O) $(LDFLAGS)
+$(BINARY_NAME): $(OBJ) Makefile
+	$(Q_LD)$(CC) -o $@ $(OBJ) $(LDFLAGS)
 
 .c.o:
 	$(Q_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -MD -c $< -o $@
--include $(SRC_C:.c=.d)
+-include $(DEP)
 
 clean:
-	rm -f $(BINARY_NAME) *.o
-	rm -f `find . -name '*.d' -print`
+	rm -f $(BINARY_NAME) $(OBJ) $(DEP)
 
 install:
 	mkdir -p $(SBINDIR)