[Pkg-wmaker-commits] [wmbubble] 89/207: Get rid of this makefile hackery to have two different names. It's just "wmbubble" henceforth.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmbubble.

commit a138c7b17945cf7d3513095618a406fbdb12c53b
Author: Robert Jacobs <rnjacobs at mit.edu>
Date:   Sat Aug 20 23:55:20 2011 -0700

    Get rid of this makefile hackery to have two different names. It's just "wmbubble" henceforth.
---
 Makefile    | 13 +++++--------
 bubblemon.c |  2 --
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 423ad16..1b040b0 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,6 @@ CFLAGS = -ansi -Wall -ggdb
 # test coverage cflags
 # CFLAGS = -ansi -Wall -ggdb -fprofile-arcs -ftest-coverage -DPRO=50000
 
-BINARY=bubblemon
 SHELL=sh
 OS = $(shell uname -s)
 OBJS = bubblemon.o wmx11pixmap.o
@@ -53,12 +52,10 @@ ifeq ($(OS), SunOS)
 	LIBS = -lX11 -lkstat -lm
 endif
 
-CFLAGS += -DNAME=\"$(BINARY)\"
+all: wmbubble
 
-all: $(BINARY)
-
-$(BINARY): $(OBJS)
-	$(CC) $(CFLAGS) -o $(BINARY) $(OBJS) $(LIBS)
+wmbubble: $(OBJS)
+	$(CC) $(CFLAGS) -o wmbubble $(OBJS) $(LIBS)
 
 bubblemon.o: bubblemon.c wmx11pixmap.h include/bubblemon.h \
  include/sys_include.h include/numbers-2.h include/ducks.h \
@@ -69,7 +66,7 @@ wmx11pixmap.o: wmx11pixmap.c wmx11pixmap.h
 sys_%.o: sys_%.c include/bubblemon.h include/sys_include.h
 
 clean:
-	rm -f $(BINARY) *.o *.bb* *.gcov gmon.* *.da *~
+	rm -f wmbubble *.o *.bb* *.gcov gmon.* *.da *~
 
 install:
-	install $(INSTALL) $(BINARY) $(PREFIX)/bin
+	install $(INSTALL) wmbubble $(PREFIX)/bin
diff --git a/bubblemon.c b/bubblemon.c
index 07a11dc..7465091 100644
--- a/bubblemon.c
+++ b/bubblemon.c
@@ -75,9 +75,7 @@
 
 /* #define DEBUG_DUCK 1 */
 
-#ifndef NAME
 #define NAME "wmbubble"
-#endif
 
 /* Want a better way to work with these. But we use them in two places now, so... */
 #define GET_RED(x) (((x)>>16)&255)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbubble.git