From 5305fc0cd0cf041a0eea3819489133111f65d1ea Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Mon, 24 Jun 2019 13:28:36 -0400 Subject: build: Unify targets, factor out configure options --- diff --git a/build b/build index cd5bd31..76ad36c 100755 --- a/build +++ b/build @@ -2,6 +2,7 @@ include ../source.mk +builddir = obj_$$(printf '%s' $@ | sed 's/^[^_]*_//') common_opts = \ --without-ada \ --without-tests \ @@ -17,32 +18,27 @@ common_opts = \ --disable-termcap \ --enable-symlinks \ --enable-const +build_ncurses_opts = $(common_opts) \ + --enable-overwrite +build_ncursesw_opts = $(common_opts) \ + --includedir=/usr/include/ncursesw \ + --without-progs \ + --disable-overwrite \ + --enable-widec nop: @: -build-ncurses: - oh-autoconfigure -B obj-ncurses -- \ - $(common_opts) \ - --enable-overwrite - oh-autobuild -B obj-ncurses +build_ncurses build_ncursesw: + oh-autoconfigure -B $(builddir) -- $($@_opts) + oh-autobuild -B $(builddir) touch $@ -build-ncursesw: - oh-autoconfigure -B obj-ncursesw -- \ - $(common_opts) \ - --includedir=/usr/include/ncursesw \ - --without-progs \ - --disable-overwrite \ - --enable-widec - oh-autobuild -B obj-ncursesw - touch $@ - -build: build-ncurses build-ncursesw +build: build_ncurses build_ncursesw install: build - (cd obj-ncurses && make install) - (cd obj-ncursesw && make install.libs) + (cd obj_ncurses && make install) + (cd obj_ncursesw && make install.libs) rm dest/usr/lib/$(OPK_HOST_ARCH)/*.a mv dest/usr/bin/clear dest/usr/bin/clear.ncurses mv dest/usr/bin/reset dest/usr/bin/reset.ncurses -- cgit v0.9.1