ref: 2889a3cbd0cdafa116ded659d1b189a58cf30e80
parent: 39ebee1972c3affd1e02c59971e77f5425da95d3
author: Roberto E. Vargas Caballero <[email protected]>
date: Mon Dec 12 05:31:41 EST 2016
Revert "Untrack config.mk and provide a default" This reverts commit 8602956fac4b220603a14c18fb9f9adfff9044bb.
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,3 @@
distclean: clean
rm -rf bin
- rm config.mk
-
-config.mk:
- cp [email protected] $@
--- /dev/null
+++ b/config.mk
@@ -1,0 +1,35 @@
+# scc version
+VERSION = 0.1
+
+## Customize below to fit your system
+ARCHS = z80 i386-sysv amd64-sysv qbe
+# default architecure used in nested makefiles
+ARCH = qbe
+DRIVER = posix
+
+# Can be c89 or c99
+STD = c99
+
+# paths
+PREFIX = $(HOME)
+MANPREFIX = $(PREFIX)/share/man
+
+# scc expects to be built by a C99 compiler
+# if your system is not at least POSIX 2004 compatible, adjust CC
+# CC = c99
+# AR = ar
+
+# for Plan9 add -D_SUSV2_SOURCE
+SCC_CFLAGS = -DARCH=\"$(ARCH)\" \
+ $(CSTDINC) \
+ -DPREFIX=\"$(PREFIX)\" \
+ -DNDEBUG \
+ $(CFLAGS)
+
+SCC_LDFLAGS = $(LDFLAGS)
+
+.c.o:
+ $(CC) $(SCC_CFLAGS) -o $@ -c $<
+
+.c:
+ $(CC) $(SCC_CFLAGS) $(SCC_LDFLAGS) -o $@ $<
--- a/config.mk.def
+++ /dev/null
@@ -1,35 +1,0 @@
-# scc version
-VERSION = 0.1
-
-## Customize below to fit your system
-ARCHS = z80 i386-sysv amd64-sysv qbe
-# default architecure used in nested makefiles
-ARCH = qbe
-DRIVER = posix
-
-# Can be c89 or c99
-STD = c99
-
-# paths
-PREFIX = $(HOME)
-MANPREFIX = $(PREFIX)/share/man
-
-# scc expects to be built by a C99 compiler
-# if your system is not at least POSIX 2004 compatible, adjust CC
-# CC = c99
-# AR = ar
-
-# for Plan9 add -D_SUSV2_SOURCE
-SCC_CFLAGS = -DARCH=\"$(ARCH)\" \
- $(CSTDINC) \
- -DPREFIX=\"$(PREFIX)\" \
- -DNDEBUG \
- $(CFLAGS)
-
-SCC_LDFLAGS = $(LDFLAGS)
-
-.c.o:
- $(CC) $(SCC_CFLAGS) -o $@ -c $<
-
-.c:
- $(CC) $(SCC_CFLAGS) $(SCC_LDFLAGS) -o $@ $<