removed the CONFIG variable from config.mk, renamed config.h into config.default.h, after first clone/extract one needs to copy config.default.h to config.h, that is easier than always heavy typing make CONFIG=blafasel
authorarg@10ksloc.org
Wed, 02 Aug 2006 16:46:59 +0200
changeset 166 e0535db04dfe
parent 165 4d828b431b72
child 167 c11f86db4550
removed the CONFIG variable from config.mk, renamed config.h into config.default.h, after first clone/extract one needs to copy config.default.h to config.h, that is easier than always heavy typing make CONFIG=blafasel
README
config.default.h
config.mk
dwm.h
--- a/README	Wed Aug 02 16:38:21 2006 +0200
+++ b/README	Wed Aug 02 16:46:59 2006 +0200
@@ -16,13 +16,9 @@
 Afterwards enter the following command to build and install dwm (if
 necessary as root):
 
+    cp config.default.h config.h
     make clean install
 
-If you want to use a customized config.h, you can use the following
-command for installing dwm:
-
-    make CONFIG=<your-config>.h clean install
-
 
 Running dwm
 -----------
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.default.h	Wed Aug 02 16:46:59 2006 +0200
@@ -0,0 +1,62 @@
+/*
+ * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+ * See LICENSE file for license details.
+ */
+
+enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
+#define TAGS \
+char *tags[TLast] = { \
+	[Tfnord] = "fnord", \
+	[Tdev] = "dev", \
+	[Tnet] = "net", \
+	[Twork] = "work", \
+	[Tmisc] = "misc", \
+};
+
+#define DEFMODE			dotile /* dofloat */
+#define DEFTAG			Tdev
+#define FONT			"fixed"
+#define BGCOLOR			"#666699"
+#define FGCOLOR			"#eeeeee"
+#define BORDERCOLOR		"#9999CC"
+#define MODKEY			Mod1Mask
+#define NUMLOCKMASK		Mod2Mask
+#define MASTERW			52 /* percent */
+
+#define KEYS \
+	const char *term[] = { "xterm", NULL }; \
+static Key key[] = { \
+	/* modifier		key		function	arguments */ \
+	{ MODKEY,		XK_0,		view,		{ .i = Tfnord } }, \
+	{ MODKEY,		XK_1,		view,		{ .i = Tdev } }, \
+	{ MODKEY,		XK_2,		view,		{ .i = Tnet } }, \
+	{ MODKEY,		XK_3,		view,		{ .i = Twork } }, \
+	{ MODKEY,		XK_4,		view,		{ .i = Tmisc} }, \
+	{ MODKEY,		XK_h,		viewprev,	{ 0 } }, \
+	{ MODKEY,		XK_j,		focusnext,	{ 0 } }, \
+	{ MODKEY,		XK_k,		focusprev,	{ 0 } }, \
+	{ MODKEY,		XK_l,		viewnext,	{ 0 } }, \
+	{ MODKEY,		XK_m,		togglemax,	{ 0 } }, \
+	{ MODKEY,		XK_space,	togglemode,	{ 0 } }, \
+	{ MODKEY,		XK_Return,	zoom,		{ 0 } }, \
+	{ MODKEY|ControlMask,	XK_0,		appendtag,	{ .i = Tfnord } }, \
+	{ MODKEY|ControlMask,	XK_1,		appendtag,	{ .i = Tdev } }, \
+	{ MODKEY|ControlMask,	XK_2,		appendtag,	{ .i = Tnet } }, \
+	{ MODKEY|ControlMask,	XK_3,		appendtag,	{ .i = Twork } }, \
+	{ MODKEY|ControlMask,	XK_4,		appendtag,	{ .i = Tmisc } }, \
+	{ MODKEY|ShiftMask,	XK_0,		replacetag,	{ .i = Tfnord } }, \
+	{ MODKEY|ShiftMask,	XK_1,		replacetag,	{ .i = Tdev } }, \
+	{ MODKEY|ShiftMask,	XK_2,		replacetag,	{ .i = Tnet } }, \
+	{ MODKEY|ShiftMask,	XK_3,		replacetag,	{ .i = Twork } }, \
+	{ MODKEY|ShiftMask,	XK_4,		replacetag,	{ .i = Tmisc } }, \
+	{ MODKEY|ShiftMask,	XK_c,		killclient,	{ 0 } }, \
+	{ MODKEY|ShiftMask,	XK_q,		quit,		{ 0 } }, \
+	{ MODKEY|ShiftMask,	XK_Return,	spawn,		{ .argv = term } }, \
+};
+
+#define RULES \
+static Rule rule[] = { \
+	/* class:instance	tags				isfloat */ \
+	{ "Firefox.*",		{ [Tnet] = "net" },		False }, \
+	{ "Gimp.*",		{ 0 },				True}, \
+};
--- a/config.mk	Wed Aug 02 16:38:21 2006 +0200
+++ b/config.mk	Wed Aug 02 16:46:59 2006 +0200
@@ -3,9 +3,6 @@
 
 # Customize below to fit your system
 
-# configheader
-CONFIG = config.h
-
 # paths
 PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/share/man
@@ -18,9 +15,9 @@
 LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
 
 # flags
-CFLAGS = -O3 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIG}\"
+CFLAGS = -O3 ${INCS} -DVERSION=\"${VERSION}\"
 LDFLAGS = ${LIBS}
-#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIG}\"
+#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = -g ${LIBS}
 
 # compiler
--- a/dwm.h	Wed Aug 02 16:38:21 2006 +0200
+++ b/dwm.h	Wed Aug 02 16:46:59 2006 +0200
@@ -3,7 +3,7 @@
  * See LICENSE file for license details.
  */
 
-#include CONFIG
+#include "config.h"
 #include <X11/Xlib.h>
 
 /* mask shorthands, used in event.c and client.c */