Mercurial > hg > sidinfo
changeset 68:8dda5f225083
Improve build process.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sun, 27 Dec 2015 22:10:29 +0200 |
parents | b114164d9ed9 |
children | 19cbd8642875 |
files | Makefile Makefile.gen Makefile.w32 |
diffstat | 3 files changed, 21 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Dec 27 22:04:43 2015 +0200 +++ b/Makefile Sun Dec 27 22:10:29 2015 +0200 @@ -4,13 +4,14 @@ # # C-compiler, flags and linker flags -CC=gcc -AR=ar -RANLIB=ranlib +PREFIX ?= /usr/local +CC ?= gcc +AR ?= ar +RANLIB ?= ranlib +INSTALL ?= install -CFLAGS=-DHAVE_STRING_H -DHAVE_STDINT_H -DHAVE_CONFIG_H=1 -I. - -LDFLAGS= +CFLAGS += -DHAVE_STRING_H -DHAVE_STDINT_H -DHAVE_CONFIG_H=1 -I. +LDFLAGS += #CFLAGS += -DHAVE_STDINT_H #CFLAGS += -DHAVE_SYS_TYPES_H @@ -25,7 +26,7 @@ ### Stuff ### ENDIANCHK_BIN=$(BINPATH)endianchk$(EXEEXT) -TARGETS += $(ENDIANCHK_BIN) config.h +NOINST_TARGETS += $(ENDIANCHK_BIN) config.h include Makefile.gen @@ -35,3 +36,6 @@ config.h: $(ENDIANCHK_BIN) $(ENDIANCHK_BIN) > $@ + +install: all + @for fn in $(TARGETS); do echo " INSTALL $$fn $(PREFIX)/bin/"; $(INSTALL) -m 755 "$$fn" $(PREFIX)/bin/; done
--- a/Makefile.gen Sun Dec 27 22:04:43 2015 +0200 +++ b/Makefile.gen Sun Dec 27 22:10:29 2015 +0200 @@ -16,15 +16,15 @@ SIDINFO_OBJ=sidinfo.o SIDINFO_BIN=$(BINPATH)sidinfo$(EXEEXT) -TARGETS+=$(THLIBS_A) $(SIDINFO_BIN) - -NONBUILD+=$(OBJPATH) $(BINPATH) +TARGETS += $(SIDINFO_BIN) +NOINST_TARGETS += $(THLIBS_A) +NONBUILD += $(OBJPATH) $(BINPATH) # # Target rules # -all: $(NONBUILD) $(TARGETS) +all: $(NONBUILD) $(NOINST_TARGETS) $(TARGETS) $(OBJPATH): $(MKDIR_P) $@
--- a/Makefile.w32 Sun Dec 27 22:04:43 2015 +0200 +++ b/Makefile.w32 Sun Dec 27 22:10:29 2015 +0200 @@ -4,13 +4,13 @@ # C-compiler, flags and linker flags MINGW_PREFIX=i686-w64-mingw32- -CC=$(MINGW_PREFIX)gcc -AR=$(MINGW_PREFIX)ar -RANLIB=$(MINGW_PREFIX)ranlib -WINDRES=$(MINGW_PREFIX)windres +CC ?= $(MINGW_PREFIX)gcc +AR ?= $(MINGW_PREFIX)ar +RANLIB ?= $(MINGW_PREFIX)ranlib +WINDRES ?= $(MINGW_PREFIX)windres -CFLAGS=-DHAVE_STRING_H -DTH_BYTEORDER=TH_LITTLE_ENDIAN -mconsole -LDFLAGS= -s +CFLAGS += -DHAVE_STRING_H -DTH_BYTEORDER=TH_LITTLE_ENDIAN -mconsole +LDFLAGS += -s # Miscellaneous EXEEXT=.exe