changeset 405:964ae4f29138 rel-1_0_0

Rename Makefile.gen to Makefile.common
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 03 Aug 2023 09:02:59 +0300
parents 39cebb2b0677
children e800c802794f
files Makefile Makefile.common Makefile.cross-mingw Makefile.djgpp Makefile.gen
diffstat 5 files changed, 38 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Mar 28 15:30:39 2023 +0300
+++ b/Makefile	Thu Aug 03 09:02:59 2023 +0300
@@ -32,7 +32,7 @@
 NOINST_TARGETS += $(ENDIANCHK_BIN) config.h
 THLIBS_DEP += config.h
 
-include Makefile.gen
+include Makefile.common
 
 
 install: all
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.common	Thu Aug 03 09:02:59 2023 +0300
@@ -0,0 +1,35 @@
+CFLAGS += -W -Wall -Wextra -std=c99 -pedantic -I./ -D_XOPEN_SOURCE=500
+CFLAGS += -g
+CFLAGS += -DTH_USE_OPT_ARG=1
+THLIBS = th-libs/
+
+ifneq ($(ASAN),)
+CFLAGS += -fsanitize=address
+LDFLAGS += -lasan
+else
+CFLAGS += -O2
+endif
+
+
+###
+### Objects and targets
+###
+THLIBS_OBJ=th_util.o th_string.o th_file.o th_args.o \
+	th_crypto.o th_datastruct.o th_ioctx.o \
+	th_ioctx_stdio.o
+
+SIDINFO_OBJ=sidlib.o sidutil.o sidinfo.o
+SIDINFO_BIN=$(BINPATH)sidinfo$(BINEXT)
+
+TARGETS += $(SIDINFO_BIN)
+
+
+###
+### Rules
+###
+include $(THLIBS)/Makefile.inc
+
+
+$(SIDINFO_BIN): $(addprefix $(OBJPATH),$(SIDINFO_OBJ)) $(THLIBS_A) $(EXTRAOBJS)
+	$(call LINK_C_BIN,)
+
--- a/Makefile.cross-mingw	Tue Mar 28 15:30:39 2023 +0300
+++ b/Makefile.cross-mingw	Thu Aug 03 09:02:59 2023 +0300
@@ -32,4 +32,4 @@
 STILGREPC_LDFLAGS += -lole32
 
 
-include Makefile.gen
+include Makefile.common
--- a/Makefile.djgpp	Tue Mar 28 15:30:39 2023 +0300
+++ b/Makefile.djgpp	Thu Aug 03 09:02:59 2023 +0300
@@ -21,5 +21,5 @@
 ###
 ### Stuff
 ###
-include Makefile.gen
+include Makefile.common
 
--- a/Makefile.gen	Tue Mar 28 15:30:39 2023 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-CFLAGS += -W -Wall -Wextra -std=c99 -pedantic -I./ -D_XOPEN_SOURCE=500
-CFLAGS += -g
-CFLAGS += -DTH_USE_OPT_ARG=1
-THLIBS = th-libs/
-
-ifneq ($(ASAN),)
-CFLAGS += -fsanitize=address
-LDFLAGS += -lasan
-else
-CFLAGS += -O2
-endif
-
-
-###
-### Objects and targets
-###
-THLIBS_OBJ=th_util.o th_string.o th_file.o th_args.o \
-	th_crypto.o th_datastruct.o th_ioctx.o \
-	th_ioctx_stdio.o
-
-SIDINFO_OBJ=sidlib.o sidutil.o sidinfo.o
-SIDINFO_BIN=$(BINPATH)sidinfo$(BINEXT)
-
-TARGETS += $(SIDINFO_BIN)
-
-
-###
-### Rules
-###
-include $(THLIBS)/Makefile.inc
-
-
-$(SIDINFO_BIN): $(addprefix $(OBJPATH),$(SIDINFO_OBJ)) $(THLIBS_A) $(EXTRAOBJS)
-	$(call LINK_C_BIN,)
-