Merge pull request iputils#120 from kerolasa/2017wk52

deprecate autotools in favour of meson

.gitignore

@@ -11,16 +11,5 @@ core
 .gdb_history
 .gdbinit
 
-# Makefile build
-/arping
-/clockdiff
-/ping
-/ping6
-/rarpd
-/rdisc
-/tftpd
-/tracepath
-/tracepath6
-/traceroute6
 # Meson build
 /builddir

.travis.yml

@@ -1,19 +1,28 @@
-language: c
+os: linux
 dist: trusty
-before_install:
-  - sudo apt-get update -qq
+sudo: false
+language: python
+python: 3.6
+cache:
+  apt: true
+  ccache: true
+addons:
+  apt:
+    packages:
+      - "python3-pip"
+      - "libcap-dev"
+      - "libidn2-0-dev"
+      - "nettle-dev"
+matrix:
+  include:
+    - env: CC=gcc
+    - env: CC=clang
 install:
-  - sudo apt-get install libcap-dev libidn2-0-dev -qq
-  - sudo apt-get install nettle-dev libidn2-0-dev -qq
-
-compiler:
-  - gcc
-  - clang
-env:
-  matrix:
-    - USE_CAP=yes
-    - USE_CAP=no
-    - USE_IDN=yes
-    - USE_IDN=no
-script: make USE_CAP=${USE_CAP} USE_IDN=${USE_IDN}
-
+  - export NINJA_LATEST=$(curl --silent https://api.github.com/repos/ninja-build/ninja/releases/latest | awk --field-separator='"' '/browser_download_url.*ninja-linux.zip/ {print $4}')
+  - wget "$NINJA_LATEST"
+  - unzip -q ninja-linux.zip -d build
+  - export PATH="$PWD/build:$PATH"
+  - pip3 install meson
+script:
+  - meson builddir
+  - ninja -C builddir

Makefile

@@ -1,233 +1,14 @@
-#
-# Configuration
-#
-
-# Path to parent kernel include files directory
-LIBC_INCLUDE=/usr/include
-# Libraries
-ADDLIB=
-# Linker flags
-LDFLAG_STATIC=-Wl,-Bstatic
-LDFLAG_DYNAMIC=-Wl,-Bdynamic
-LDFLAG_CAP=-lcap
-LDFLAG_GCRYPT=-lgcrypt -lgpg-error
-LDFLAG_NETTLE=-lnettle
-LDFLAG_CRYPTO=-lcrypto
-LDFLAG_IDN=-lidn2
-LDFLAG_RESOLV=-lresolv
-LDFLAG_RT=-lrt
-LDFLAG_M=-lm
-
-#
-# Options
-#
-
-# Capability support (with libcap) [yes|static|no]
-USE_CAP=yes
-# sysfs support
-USE_SYSFS=yes
-# IDN support  [yes|no|static]
-USE_IDN=yes
-
-# Do not use getifaddrs [no|yes|static]
-WITHOUT_IFADDRS=no
-# arping default device (e.g. eth0) []
-ARPING_DEFAULT_DEVICE=
-
-# nettle library for ipv6 ping [yes|no|static]
-USE_NETTLE=yes
-# libgcrypt library for ipv6 ping [no|yes|static]
-USE_GCRYPT=no
-# Crypto library for ping6 [shared|static|no]
-USE_CRYPTO=shared
-# Resolv library for ping6 [yes|static]
-USE_RESOLV=yes
-# ping6 source routing (deprecated by RFC5095) [no|yes|RFC3542]
-ENABLE_PING6_RTHDR=no
-
-# rdisc server (-r option) support [no|yes]
-ENABLE_RDISC_SERVER=no
-
-# -------------------------------------
-# What a pity, all new gccs are buggy and -Werror does not work. Sigh.
-# CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
-CFLAGS?=-O3 -g
-CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall
-CPPFLAGS+=-D_GNU_SOURCE
-LDLIB=
-
-FUNC_LIB = $(if $(filter static,$(1)),$(LDFLAG_STATIC) $(2) $(LDFLAG_DYNAMIC),$(2))
-
-# USE_GCRYPT: DEF_GCRYPT, LIB_GCRYPT
-# USE_CRYPTO: LIB_CRYPTO
-ifneq ($(USE_GCRYPT),no)
-	LIB_CRYPTO = $(call FUNC_LIB,$(USE_GCRYPT),$(LDFLAG_GCRYPT))
-	DEF_CRYPTO = -DUSE_GCRYPT
-else
-ifneq ($(USE_NETTLE),no)
-	LIB_CRYPTO = $(call FUNC_LIB,$(USE_NETTLE),$(LDFLAG_NETTLE))
-	DEF_CRYPTO = -DUSE_NETTLE
-else
-ifneq ($(USE_CRYPTO),no)
-	LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO))
-	DEF_CRYPTO = -DUSE_OPENSSL
-endif
-endif
-endif
-
-# USE_RESOLV: LIB_RESOLV
-LIB_RESOLV = $(call FUNC_LIB,$(USE_RESOLV),$(LDFLAG_RESOLV))
-
-# USE_CAP:  DEF_CAP, LIB_CAP
-ifneq ($(USE_CAP),no)
-	DEF_CAP = -DCAPABILITIES
-	LIB_CAP = $(call FUNC_LIB,$(USE_CAP),$(LDFLAG_CAP))
-endif
-
-# USE_SYSFS: DEF_SYSFS, LIB_SYSFS
-ifneq ($(USE_SYSFS),no)
-	DEF_SYSFS = -DUSE_SYSFS
-endif
-
-# USE_IDN: DEF_IDN, LIB_IDN
-ifneq ($(USE_IDN),no)
-	DEF_IDN = -DUSE_IDN
-	LIB_IDN = $(call FUNC_LIB,$(USE_IDN),$(LDFLAG_IDN))
-endif
-
-# WITHOUT_IFADDRS: DEF_WITHOUT_IFADDRS
-ifneq ($(WITHOUT_IFADDRS),no)
-	DEF_WITHOUT_IFADDRS = -DWITHOUT_IFADDRS
-endif
-
-# ENABLE_RDISC_SERVER: DEF_ENABLE_RDISC_SERVER
-ifneq ($(ENABLE_RDISC_SERVER),no)
-	DEF_ENABLE_RDISC_SERVER = -DRDISC_SERVER
-endif
-
-# ENABLE_PING6_RTHDR: DEF_ENABLE_PING6_RTHDR
-ifneq ($(ENABLE_PING6_RTHDR),no)
-	DEF_ENABLE_PING6_RTHDR = -DPING6_ENABLE_RTHDR
-ifeq ($(ENABLE_PING6_RTHDR),RFC3542)
-	DEF_ENABLE_PING6_RTHDR += -DPINR6_ENABLE_RTHDR_RFC3542
-endif
-endif
-
-# -------------------------------------
-TARGETS=ping tracepath traceroute6 clockdiff rdisc arping tftpd rarpd
-
-LDLIBS=$(LDLIB) $(ADDLIB)
-
-TODAY=$(shell date +%Y-%m-%d)
-DATE=$(shell date -d $(TODAY) +%Y%m%d)
-TAG:=$(shell date -d $(TODAY) +s%Y%m%d)
-
-
-# -------------------------------------
-.PHONY: all ninfod clean distclean man html snapshot
-
-all: $(TARGETS)
-
-%.s: %.c
-	$(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -S -o $@
-%.o: %.c
-	$(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -o $@
-LINK.o += $(CFLAGS)
-$(TARGETS): %: %.o
-	$(LINK.o) $^ $(LIB_$@) $(LDLIBS) -o $@
-
-# -------------------------------------
-# arping
-DEF_arping = $(DEF_SYSFS) $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
-LIB_arping = $(LIB_CAP) $(LIB_IDN) $(LDFLAG_RT)
-
-ifneq ($(ARPING_DEFAULT_DEVICE),)
-DEF_arping += -DDEFAULT_DEVICE=\"$(ARPING_DEFAULT_DEVICE)\"
-endif
-
-# clockdiff
-DEF_clockdiff = $(DEF_CAP)
-LIB_clockdiff = $(LIB_CAP)
-
-# ping / ping6
-DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_CRYPTO) $(DEF_WITHOUT_IFADDRS)
-DEF_ping_common = $(DEF_ping)
-DEF_ping6_common = $(DEF_ping)
-LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_CRYPTO) $(LIB_RESOLV) $(LDFLAG_M)
-
-ping: ping_common.o ping6_common.o
-ping.o ping_common.o ping6_common.o: ping.h in6_flowlabel.h
-ping6.o ping6_common.o: ping.h in6_flowlabel.h
-
-# rarpd
-DEF_rarpd =
-LIB_rarpd =
-
-# rdisc
-DEF_rdisc = $(DEF_ENABLE_RDISC_SERVER)
-LIB_rdisc =
-
-# tracepath
-DEF_tracepath = $(DEF_IDN)
-LIB_tracepath = $(LIB_IDN)
-
-# traceroute6
-DEF_traceroute6 = $(DEF_CAP) $(DEF_IDN)
-LIB_traceroute6 = $(LIB_CAP) $(LIB_IDN)
-
-# tftpd
-DEF_tftpd =
-DEF_tftpsubs =
-LIB_tftpd =
-
-tftpd: tftpsubs.o
-tftpd.o tftpsubs.o: tftp.h
-
-# -------------------------------------
-# ninfod
-ninfod:
-	@set -e; \
-		if [ ! -f ninfod/Makefile ]; then \
-			cd ninfod; \
-			./configure; \
-			cd ..; \
-		fi; \
-		$(MAKE) -C ninfod
-
-# -------------------------------------
-man:
-	$(MAKE) -C doc man
-
-html:
-	$(MAKE) -C doc html
+all:
+	ninja -C builddir
 
 clean:
-	@rm -f *.o $(TARGETS)
-	@$(MAKE) -C Modules clean
-	@$(MAKE) -C doc clean
-	@set -e; \
-		if [ -f ninfod/Makefile ]; then \
-			$(MAKE) -C ninfod clean; \
-		fi
-
-distclean: clean
-	@set -e; \
-		if [ -f ninfod/Makefile ]; then \
-			$(MAKE) -C ninfod distclean; \
-		fi
+	ninja -C builddir clean
 
-# -------------------------------------
-RPMBUILD=rpmbuild
-RPMTMP=.rpmtmp
-snapshot:
-	@echo "#define SNAPSHOT \"$(TAG)\"" > SNAPSHOT.h
-	@$(MAKE) man
-	@git commit -a -m "iputils-$(TAG)"
-	@git tag -s -m "iputils-$(TAG)" $(TAG)
-	@git archive --format=tar --prefix=iputils-$(TAG)/ $(TAG) | bzip2 -9 > ../iputils-$(TAG).tar.bz2
+install:
+	DESTDIR=$(DESTDIR) ninja -C builddir install
 
-rpm:
-	@git archive --format=tar --prefix=iputils/ HEAD | bzip2 -9 > $(RPMTMP)/iputils.tar.bz2
-	@$(RPMBUILD) -ta --define 'current yes' $(RPMTMP)/iputils.tar.bz2
-	@rm -f $(RPMTMP)/iputils.tar.bz2
+dist:
+	ninja -C builddir dist
 
+check:
+	ninja -C builddir test