[Pkg-wmaker-commits] [wmbubble] 99/207: Get rid of the Makefile.*; try to make plain Makefile smart enough. Don't have a machine to test on, though...

[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 e946d2c1791176a9515c3346f8242b0fd4deccc6
Author: Robert Jacobs <rnjacobs at mit.edu>
Date:   Wed Aug 31 17:54:14 2011 -0700

    Get rid of the Makefile.*; try to make plain Makefile smart enough. Don't have a machine to test on, though...
---
 Makefile         |  7 +++++++
 Makefile.FreeBSD | 33 ---------------------------------
 Makefile.NetBSD  | 33 ---------------------------------
 3 files changed, 7 insertions(+), 66 deletions(-)

diff --git a/Makefile b/Makefile
index 1b040b0..e08847b 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,13 @@ ifeq ($(OS), FreeBSD)
 	INSTALL = -c -g kmem -m 2755 -o root
 endif
 
+# special things for NetBSD
+ifeq ($(OS), NetBSD)
+	OBJS += sys_netbsd.o
+	LIBS = -lX11 -lkvm -lm
+	INSTALL = -c -g kmem -m 2755 -o root
+endif
+
 # special things for OpenBSD
 ifeq ($(OS), OpenBSD)
 	OBJS += sys_openbsd.o
diff --git a/Makefile.FreeBSD b/Makefile.FreeBSD
deleted file mode 100644
index 9aa9523..0000000
--- a/Makefile.FreeBSD
+++ /dev/null
@@ -1,33 +0,0 @@
-# bubblemon configuration
-
-EXTRA += $(WMAN)
-
-# no user serviceable parts below
-CC = gcc
-
-# optimization cflags
-CFLAGS = -O3 -ansi -Wall `gtk-config --cflags` ${EXTRA}
-# profiling cflags
-# CFLAGS = -ansi -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO
-# test coverage cflags
-# CFLAGS = -fprofile-arcs -ftest-coverage -Wall -ansi -g `gtk-config --cflags` ${EXTRA} -DPRO
-
-LIBS = `gtk-config --libs | sed "s/-l.*//g"` -lgdk12 -lkvm
-PREFIX = /usr/X11R6
-VPATH = include
-
-all: bubblemon
-
-bubblemon: bubblemon.o sys_freebsd.o
-	gcc ${CFLAGS} -o bubblemon bubblemon.o sys_freebsd.o ${LIBS}
-
-clean:
-	rm -f bubblemon bubblemon.o *.o *.bb* *.gcov gmon.* *.da winglue.c bubblemon32 *.so win32.spec *~ *.gmon *.s *.core
-
-install:
-	install -c -g kmem -m 2755 -o root bubblemon ${PREFIX}/bin
-
-bubblemon.o: bubblemon.h ducks.h master.xpm sys_include.h digits.h \
-	load_screen.h mem_screen.h
-
-sys_freebsd.o: bubblemon.h
diff --git a/Makefile.NetBSD b/Makefile.NetBSD
deleted file mode 100644
index 1176fb8..0000000
--- a/Makefile.NetBSD
+++ /dev/null
@@ -1,33 +0,0 @@
-# bubblemon configuration
-
-EXTRA += $(WMAN)
-
-# no user serviceable parts below
-CC = gcc
-
-# optimization cflags
-CFLAGS = -O2 -ansi -Wall `gtk-config --cflags` ${EXTRA}
-# profiling cflags
-# CFLAGS = -ansi -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO
-# test coverage cflags
-# CFLAGS = -fprofile-arcs -ftest-coverage -Wall -ansi -g `gtk-config --cflags` ${EXTRA} -DPRO
-
-LIBS = `gtk-config --libs | sed "s/-l.*//g"` -lgdk -lkvm
-PREFIX = /usr/X11R6
-VPATH = include
-
-all: bubblemon
-
-bubblemon: bubblemon.o sys_netbsd.o
-	gcc ${CFLAGS} -o bubblemon bubblemon.o sys_netbsd.o ${LIBS}
-
-clean:
-	rm -f bubblemon bubblemon.o *.o *.bb* *.gcov gmon.* *.da winglue.c bubblemon32 *.so win32.spec *~ *.gmon *.s *.core
-
-install:
-	install -c -g kmem -m 2755 -o root bubblemon ${PREFIX}/bin
-
-bubblemon.o: bubblemon.h ducks.h master.xpm sys_include.h digits.h \
-	load_screen.h mem_screen.h
-
-sys_netbsd.o: bubblemon.h

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