Mercurial > hg > th-libs

changeset 782:94e8e6ad8c9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename Makefile.gen to Makefile.common
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 03 Aug 2023 09:04:43 +0300
parents 4cc514343376
children db1a132c7754
files Makefile Makefile.common Makefile.cross-mingw Makefile.gen
diffstat 4 files changed, 43 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Jul 04 01:24:38 2023 +0300
+++ b/Makefile	Thu Aug 03 09:04:43 2023 +0300
@@ -26,4 +26,4 @@
 NOINST_TARGETS += $(ENDIANCHK_BIN) config.h
 THLIBS_DEP += config.h
 
-include Makefile.gen
+include Makefile.common
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.common	Thu Aug 03 09:04:43 2023 +0300
@@ -0,0 +1,41 @@
+###
+### Compiler flags and paths
+###
+CFLAGS += -W -Wall -Wextra -D_XOPEN_SOURCE=500 -I./
+CFLAGS += -std=c11 -pedantic
+CFLAGS += -g
+CFLAGS += -O2
+CFLAGS += -DTH_USE_INTERNAL_SPRINTF=1
+CFLAGS += -DTH_PRINTF_DEBUG=1
+CFLAGS += -DTH_USE_OPT_ARG=1
+#CFLAGS += -DTH_EXPERIMENTAL_REGEX=1
+#CFLAGS += -DTH_EXPERIMENTAL_REGEX_DEBUG=1
+
+THLIBS  = ./
+
+###
+### Objects and binaries
+###
+THLIBS_A=$(OBJPATH)thlibs.a
+THLIBS_OBJ=th_util.o th_config.o th_string.o th_args.o \
+	th_crypto.o th_datastruct.o th_network.o th_file.o \
+	th_ioctx.o th_ioctx_stdio.o th_ioctx_mem.o th_regex.o
+
+
+TESTS_OBJ=tests.o
+TESTS_BIN=$(BINPATH)tests$(BINEXT)
+
+TARGETS += $(TESTS_BIN)
+
+include $(THLIBS)/Makefile.inc
+
+
+###
+### Extra targets
+###
+$(TESTS_BIN): $(addprefix $(OBJPATH),$(TESTS_OBJ)) $(THLIBS_A)
+	$(LINK_C_BIN)
+
+check: $(TESTS_BIN)
+	$(TESTS_BIN) -v
+
--- a/Makefile.cross-mingw	Tue Jul 04 01:24:38 2023 +0300
+++ b/Makefile.cross-mingw	Thu Aug 03 09:04:43 2023 +0300
@@ -30,5 +30,5 @@
 
 LDFLAGS +=
 
-include Makefile.gen
+include Makefile.common
 
--- a/Makefile.gen	Tue Jul 04 01:24:38 2023 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-###
-### Compiler flags and paths
-###
-CFLAGS += -W -Wall -Wextra -D_XOPEN_SOURCE=500 -I./
-CFLAGS += -std=c11 -pedantic
-CFLAGS += -g
-CFLAGS += -O2
-CFLAGS += -DTH_USE_INTERNAL_SPRINTF=1
-CFLAGS += -DTH_PRINTF_DEBUG=1
-CFLAGS += -DTH_USE_OPT_ARG=1
-#CFLAGS += -DTH_EXPERIMENTAL_REGEX=1
-#CFLAGS += -DTH_EXPERIMENTAL_REGEX_DEBUG=1
-
-THLIBS  = ./
-
-###
-### Objects and binaries
-###
-THLIBS_A=$(OBJPATH)thlibs.a
-THLIBS_OBJ=th_util.o th_config.o th_string.o th_args.o \
-	th_crypto.o th_datastruct.o th_network.o th_file.o \
-	th_ioctx.o th_ioctx_stdio.o th_ioctx_mem.o th_regex.o
-
-
-TESTS_OBJ=tests.o
-TESTS_BIN=$(BINPATH)tests$(BINEXT)
-
-TARGETS += $(TESTS_BIN)
-
-include $(THLIBS)/Makefile.inc
-
-
-###
-### Extra targets
-###
-$(TESTS_BIN): $(addprefix $(OBJPATH),$(TESTS_OBJ)) $(THLIBS_A)
-	$(LINK_C_BIN)
-
-check: $(TESTS_BIN)
-	$(TESTS_BIN) -v
-