st

commit 3a97a6a608f3465944e4d18a1e5ed55f84e21e47
parent 315e8e2d8c2df81a342a2a919741eab1b968e7f3
Author: mpizzzle <michael.770211@gmail.com>
Date:   Mon, 18 May 2020 23:41:07 +0100

cleaning up makefile a little

Diffstat:
M
FAQ
 | 
2
+-
M
Makefile
 | 
9
+++------
M
config.def.h
 | 
2
+-
M
st.1
 | 
2
+-
M
st.h
 | 
2
+-
M
x.c
 | 
10
+++++-----

6 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/FAQ b/FAQ
@@ -25,7 +25,7 @@ you can manually run `tic -sx st.info`.
 
 ## I would like to have utmp and/or scroll functionality by default
 
-You can add the absolute patch of both programs in your config.h
+You can add the absolute patch of both programs in your config.def.h
 file. You only have to modify the value of utmp and scroll variables.
 
 ## Why doesn't the Del key work in some programs?
diff --git a/Makefile b/Makefile
@@ -15,16 +15,13 @@ options:
 	@echo "LDFLAGS = $(STLDFLAGS)"
 	@echo "CC      = $(CC)"
 
-config.h:
-	cp config.def.h config.h
-
 .c.o:
 	$(CC) $(STCFLAGS) -c $<
 
-st.o: config.h st.h win.h
-x.o: arg.h config.h st.h win.h
+st.o: config.def.h st.h win.h
+x.o: arg.h config.def.h st.h win.h
 
-$(OBJ): config.h config.mk
+$(OBJ): config.def.h config.mk
 
 st: $(OBJ)
 	$(CC) -o $@ $(OBJ) $(STLDFLAGS)
diff --git a/config.def.h b/config.def.h
@@ -14,7 +14,7 @@ static int borderpx = 2;
  * 2: scroll and/or utmp
  * 3: SHELL environment variable
  * 4: value of shell in /etc/passwd
- * 5: value of shell in config.h
+ * 5: value of shell in config.def.h
  */
 static char *shell = "/bin/sh";
 char *utmp = NULL;
diff --git a/st.1 b/st.1
@@ -161,7 +161,7 @@ Copy the selected text to the clipboard selection.
 Paste from the clipboard selection.
 .SH CUSTOMIZATION
 .B st
-can be customized by creating a custom config.h and (re)compiling the source
+can be customized by creating a custom config.def.h and (re)compiling the source
 code. This keeps it fast, secure and simple.
 .SH AUTHORS
 See the LICENSE file for the authors.
diff --git a/st.h b/st.h
@@ -113,7 +113,7 @@ void *xmalloc(size_t);
 void *xrealloc(void *, size_t);
 char *xstrdup(char *);
 
-/* config.h globals */
+/* config.def.h globals */
 extern char *utmp;
 extern char *scroll;
 extern char *stty_args;
diff --git a/x.c b/x.c
@@ -21,7 +21,7 @@ char *argv0;
 #include "st.h"
 #include "win.h"
 
-/* types used in config.h */
+/* types used in config.def.h */
 typedef struct {
 	uint mod;
 	KeySym keysym;
@@ -51,7 +51,7 @@ typedef struct {
 #define XK_NO_MOD     0
 #define XK_SWITCH_MOD (1<<13)
 
-/* function definitions used in config.h */
+/* function definitions used in config.def.h */
 static void clipcopy(const Arg *);
 static void clippaste(const Arg *);
 static void numlock(const Arg *);
@@ -61,8 +61,8 @@ static void zoomabs(const Arg *);
 static void zoomreset(const Arg *);
 static void ttysend(const Arg *);
 
-/* config.h for applying patches and the configuration. */
-#include "config.h"
+/* config.def.h for applying patches and the configuration. */
+#include "config.def.h"
 
 /* XEMBED messages */
 #define XEMBED_FOCUS_IN  4
@@ -1846,7 +1846,7 @@ kpress(XEvent *ev)
 		}
 	}
 
-	/* 2. custom keys from config.h */
+	/* 2. custom keys from config.def.h */
 	if ((customkey = kmap(ksym, e->state))) {
 		ttywrite(customkey, strlen(customkey), 1);
 		return;