Mercurial > hg > sidinfo
changeset 4:ea774012d049
Fix build system.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Thu, 25 Sep 2014 01:54:33 +0300 |
| parents | dbe35d78e621 |
| children | 2892e994243c |
| files | Makefile Makefile.gen Makefile.w32 |
| diffstat | 3 files changed, 25 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Sep 25 01:46:22 2014 +0300 +++ b/Makefile Thu Sep 25 01:54:33 2014 +0300 @@ -8,7 +8,8 @@ AR=ar RANLIB=ranlib -CFLAGS=-DHAVE_STRING_H -DHAVE_STDINT_H +CFLAGS=-DHAVE_STRING_H -DHAVE_STDINT_H -DHAVE_CONFIG_H=1 -I. + LDFLAGS= #CFLAGS += -DHAVE_STDINT_H @@ -20,4 +21,17 @@ EXEEXT= +### +### Stuff +### +ENDIANCHK_BIN=$(BINPATH)endianchk$(EXEEXT) +TARGETS += $(ENDIANCHK_BIN) + include Makefile.gen + + +$(ENDIANCHK_BIN): endianchk.o + $(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS) + +config.h: $(ENDIANCHK_BIN) + $(ENDIANCHK_BIN) > $@
--- a/Makefile.gen Thu Sep 25 01:46:22 2014 +0300 +++ b/Makefile.gen Thu Sep 25 01:54:33 2014 +0300 @@ -1,4 +1,4 @@ -CFLAGS += -g -W -Wall -Wextra -DHAVE_CONFIG_H=1 -I. +CFLAGS += -g -W -Wall -Wextra CFLAGS += -O2 #CFLAGS += -std=c99 -pedantic THLIBS=th-libs/ @@ -12,12 +12,11 @@ THLIBS_A=$(OBJPATH)thlibs.a THLIBS_OBJ=th_util.o th_string.o th_endian.o th_args.o th_crypto.o -ENDIANCHK_BIN=$(BINPATH)endianchk$(EXEEXT) SIDINFO_OBJ=sidinfo.o SIDINFO_BIN=$(BINPATH)sidinfo$(EXEEXT) -TARGETS+=$(THLIBS_A) $(SIDINFO_BIN) $(ENDIANCHK_BIN) +TARGETS+=$(THLIBS_A) $(SIDINFO_BIN) NONBUILD+=$(OBJPATH) $(BINPATH) config.h @@ -43,19 +42,13 @@ $(CC) $(CFLAGS) -c -o $@ $< -I$(THLIBS) -$(THLIBS_A): $(ENDIANCHK_BIN) $(addprefix $(OBJPATH),$(THLIBS_OBJ)) +$(THLIBS_A): $(addprefix $(OBJPATH),$(THLIBS_OBJ)) $(AR) cru $@ $(addprefix $(OBJPATH),$(THLIBS_OBJ)) $(RANLIB) $@ $(SIDINFO_BIN): $(addprefix $(OBJPATH),$(SIDINFO_OBJ)) $(THLIBS_A) $(EXTRAOBJS) $(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS) -$(ENDIANCHK_BIN): endianchk.o - $(CC) -o $@ $+ - -config.h: - $(ENDIANCHK_BIN) > $@ - # # Special targets #
--- a/Makefile.w32 Thu Sep 25 01:46:22 2014 +0300 +++ b/Makefile.w32 Thu Sep 25 01:54:33 2014 +0300 @@ -9,12 +9,17 @@ RANLIB=$(MINGW_PREFIX)ranlib WINDRES=$(MINGW_PREFIX)windres -CFLAGS=-DHAVE_STRING_H -mconsole +CFLAGS=-DHAVE_STRING_H -DTH_BYTEORDER=TH_LITTLE_ENDIAN -mconsole LDFLAGS= -s # Miscellaneous EXEEXT=.exe OBJPATH=obj/win32/ -BINPATH=exe/ +BINPATH=./ + +### +### Stuff +### include Makefile.gen +