# HG changeset patch # User Matti Hamalainen # Date 1457525013 -7200 # Node ID e0880165f37985a4820f4b96c7614921161c3cb1 # Parent 9fb96c170bbc314603b9be5fe9d46b2ea3bab7d4 Use generic build stuff from thlibs Makefile.inc. diff -r 9fb96c170bbc -r e0880165f379 Makefile.gen --- a/Makefile.gen Wed Mar 09 13:56:20 2016 +0200 +++ b/Makefile.gen Wed Mar 09 14:03:33 2016 +0200 @@ -3,8 +3,6 @@ CFLAGS += -O2 THLIBS = th-libs/ -MKDIR ?= mkdir -MKDIR_P ?= $(MKDIR) -p # # Objects @@ -12,55 +10,13 @@ THLIBS_A=$(OBJPATH)thlibs.a THLIBS_OBJ=th_util.o th_string.o th_ioctx.o th_args.o th_crypto.o - SIDINFO_OBJ=sidlib.o sidinfo.o SIDINFO_BIN=$(BINPATH)sidinfo$(EXEEXT) TARGETS += $(SIDINFO_BIN) -NOBUILD_TARGETS += $(OBJPATH) $(BINPATH) -NOINST_TARGETS += $(THLIBS_A) - - -# -# Target rules -# -all: $(NOBUILD_TARGETS) $(NOINST_TARGETS) $(TARGETS) - -$(THLIBS)th_string.c: $(addprefix $(THLIBS), th_printf1.c th_strmatch.c th_string.h) - touch $@ - -$(OBJPATH) $(BINPATH): - @echo " MKDIR $@" - @$(MKDIR_P) $@ - -$(OBJPATH)%.o: $(THLIBS)%.c $(THLIBS)%.h $(THLIBS_DEP) - @echo " CC $@ $+" - @$(CC) $(CFLAGS) -c -o $@ $< - -$(OBJPATH)%.o: %.c %.h $(THLIBS_DEP) - @echo " CC $@ $+" - @$(CC) $(CFLAGS) -c -o $@ $< -I$(THLIBS) - -$(OBJPATH)%.o: %.c $(THLIBS_DEP) - @echo " CC $@" - @$(CC) $(CFLAGS) -c -o $@ $< -I$(THLIBS) - - -$(THLIBS_A): $(addprefix $(OBJPATH),$(THLIBS_OBJ)) - @echo " AR $@" - @$(AR) cru $@ $(addprefix $(OBJPATH),$(THLIBS_OBJ)) - @$(RANLIB) $@ $(SIDINFO_BIN): $(addprefix $(OBJPATH),$(SIDINFO_OBJ)) $(THLIBS_A) $(EXTRAOBJS) @echo " LINK $@" @$(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS) -# -# Special targets -# -clean: - $(RM) $(TARGETS) $(NOINST_TARGETS) $(OBJPATH)*.o - -srcclean: clean - $(RM) *~ - +include $(THLIBS)/Makefile.inc