diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-01-13 23:13:31 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-01-13 23:13:31 +0000 |
| commit | adbdf542815ce424fe647de1899147a37dd8b136 (patch) | |
| tree | 1a447bfc02a58143aa13fe1de62a04c292d4e278 | |
| parent | c25ebf65eb5ba92ef0f0cdca1e63433e937b96bd (diff) | |
| download | s6-linux-utils-adbdf542815ce424fe647de1899147a37dd8b136.tar.gz s6-linux-utils-adbdf542815ce424fe647de1899147a37dd8b136.tar.xz s6-linux-utils-adbdf542815ce424fe647de1899147a37dd8b136.zip | |
Align to other packages
| -rw-r--r-- | COPYING | 2 | ||||
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rwxr-xr-x | tools/gen-deps.sh | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/COPYING b/COPYING index 63309ba..a49b1ca 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2011-2014 Laurent Bercot <ska-skaware@skarnet.org> +Copyright (c) 2011-2015 Laurent Bercot <ska-skaware@skarnet.org> Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/Makefile b/Makefile index b9eb4ea..d80ba55 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ CC = $(error Please use ./configure first) STATIC_LIBS := SHARED_LIBS := +INTERNAL_LIBS := -include config.mak include package/targets.mak @@ -32,7 +33,7 @@ STRIP := $(CROSS_COMPILE)strip INSTALL := ./tools/install.sh ALL_BINS := $(LIBEXEC_TARGETS) $(BIN_TARGETS) $(SBIN_TARGETS) -ALL_LIBS := $(SHARED_LIBS) $(STATIC_LIBS) +ALL_LIBS := $(SHARED_LIBS) $(STATIC_LIBS) $(INTERNAL_LIBS) ALL_INCLUDES := $(wildcard src/include/$(package)/*.h) all: $(ALL_LIBS) $(ALL_BINS) $(ALL_INCLUDES) @@ -122,5 +123,3 @@ lib%.so: .PHONY: it all clean distclean tgz strip install install-dynlib install-bin install-sbin install-lib install-include .DELETE_ON_ERROR: - -.NOTPARALLEL: diff --git a/configure b/configure index 056061c..d8d62e8 100755 --- a/configure +++ b/configure @@ -169,8 +169,8 @@ for arg ; do --enable-static|--enable-static=yes) static=true ;; --disable-static|--enable-static=no) static=false ;; --enable-allstatic|--enable-allstatic=yes) allstatic=true ;; - --disable-allstatic|--enable-allstatic=no) allstatic=false ;; - --enable-static-libc|--enable-static-libc=yes) evenmorestatic=true ;; + --disable-allstatic|--enable-allstatic=no) allstatic=false ; evenmorestatic=false ;; + --enable-static-libc|--enable-static-libc=yes) allstatic=true ; evenmorestatic=true ;; --disable-static-libc|--enable-static-libc=no) evenmorestatic=false ;; --enable-slashpackage=*) sproot=${arg#*=} ; slashpackage=true ; ;; --enable-slashpackage) sproot= ; slashpackage=true ;; @@ -358,6 +358,7 @@ vpath lib%a$vpaths EOF if $allstatic ; then echo ".LIBPATTERNS := lib%.a" + echo "DO_ALLSTATIC := 1" vpathd= fi echo "vpath lib%.so$vpathd" diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh index 5824dd6..2f7c57d 100755 --- a/tools/gen-deps.sh +++ b/tools/gen-deps.sh @@ -71,7 +71,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do if echo $dep | grep -q -- \\.o$ ; then dep="src/$dir/$dep" fi - if echo $dep | grep -q ^\\\$ ; then + if echo $dep | grep -q '^\${.*_LIB}' ; then libs="$libs $dep" else deps="$deps $dep" |