diff options
| author | Frediano Ziglio <freddy77@gmail.com> | 2016-10-04 19:10:52 +0100 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2016-10-04 19:16:49 +0100 |
| commit | 3578156b3daa0e542afc3890a7cda29a670bedca (patch) | |
| tree | 5869a9a2ff75b4a6ef88c75386a4933aabfcf980 | |
| parent | 378f9b685ec6610f3600de799672f1093520dbcb (diff) | |
Convert project to autoconf
Allow more complicated rules.
Avoid duplication of version.
Use more standard settings in Makefiles.
Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
| -rw-r--r-- | .gitignore | 17 | ||||
| -rw-r--r-- | Makefile | 32 | ||||
| -rw-r--r-- | Makefile.am | 25 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | latency.spec.in (renamed from latency.spec) | 2 |
5 files changed, 49 insertions, 33 deletions
@@ -1,3 +1,20 @@ latency latency.1 latency-*.tar.gz +install-sh +stamp-h1 +configure +Makefile.in +Makefile +aclocal.m4 +autom4te.cache/ +.deps/ +compile +config.h +config.h.in +config.log +config.status +depcomp +missing +*.o +latency.spec diff --git a/Makefile b/Makefile deleted file mode 100644 index b808414..0000000 --- a/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -CFLAGS ?= -O2 -Wall -g -CC ?= gcc -INSTDIR ?= /usr/local/bin -MANDIR ?= /usr/local/share/man/man1 -VERSION = 1.0 -SOURCES = latency.c tun.c utils.c latency.h tun.h utils.h - -all: latency latency.1 - -latency: $(SOURCES) - $(CC) $(CFLAGS) -o $@ $^ -pthread - -latency.1: README.md - ronn < $< > $@ - -clean:: - rm -f latency latency.1 - -install:: latency latency.1 - umask 022 && cp $< $(INSTDIR) - chown root: $(INSTDIR)/$< - chmod 4751 $(INSTDIR)/$< - cp latency.1 $(MANDIR)/latency.1 - chown root: $(MANDIR)/latency.1 - -dist:: latency-$(VERSION).tar.gz - -latency-$(VERSION).tar.gz: Makefile $(SOURCES) - git archive HEAD --prefix latency-$(VERSION)/ | gzip -9 > $@ - -rpm:: dist - rpmbuild -D "_sourcedir $$PWD" -ba latency.spec diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..1bdcb7c --- /dev/null +++ b/Makefile.am @@ -0,0 +1,25 @@ +NULL = + +bin_PROGRAMS = latency +latency_SOURCES = \ + latency.c \ + tun.c \ + utils.c \ + latency.h \ + tun.h \ + utils.h \ + $(NULL) +latency_LDFLAGS = -pthread + +man1_MANS = latency.1 + +latency.1: README.md + ronn < $< > $@.tmp + mv -f $@.tmp $@ + +EXTRA_DIST = \ + latency.spec \ + README.md \ + latency.1 \ + $(NULL) +CLEANFILES = latency.1 diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..6e017da --- /dev/null +++ b/configure.ac @@ -0,0 +1,6 @@ +AC_INIT([latency], [1.0], [freddy77@gmail.com]) +AM_INIT_AUTOMAKE([-Wall -Werror foreign]) +AC_PROG_CC +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_FILES([Makefile latency.spec]) +AC_OUTPUT diff --git a/latency.spec b/latency.spec.in index 6348ee3..ea61010 100644 --- a/latency.spec +++ b/latency.spec.in @@ -1,5 +1,5 @@ Name: latency -Version: 1.0 +Version: @VERSION@ Release: 1%{?dist} Summary: Utility to help test network latency/bandwidth problems |