# HG changeset patch # User Matti Hamalainen # Date 1691042579 -10800 # Node ID 964ae4f291380f24153ce972914df1f79ee8f92b # Parent 39cebb2b0677dd94d0dbcebf3ca0d6555e3081c8 Rename Makefile.gen to Makefile.common diff -r 39cebb2b0677 -r 964ae4f29138 Makefile --- 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 diff -r 39cebb2b0677 -r 964ae4f29138 Makefile.common --- /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,) + diff -r 39cebb2b0677 -r 964ae4f29138 Makefile.cross-mingw --- 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 diff -r 39cebb2b0677 -r 964ae4f29138 Makefile.djgpp --- 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 diff -r 39cebb2b0677 -r 964ae4f29138 Makefile.gen --- 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,) -