summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Jennings <mej@lanl.gov>2020-11-13 09:57:16 -0700
committerMichael Jennings <mej@lanl.gov>2020-11-13 09:57:16 -0700
commit13d5436dc61cb89c86de1575634c967f1319984c (patch)
treeabe1fe602f2eb8f8ba6b02a1a4fc1515994e1fe8
parentf3118e44ad49abda6823aa28473325c0f5366547 (diff)
parent52f1c8f115a3f4f86ed38ff137887042d0a734ad (diff)
Merge remote-tracking branch 'remotes/gh/master'
* remotes/gh/master: Bump version; git-ize Release in specfile */Makefile.am: Fix include paths and `distclean` libast.spec: Add %{?dist} tag to Release field Fix build on RHEL8
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac8
-rw-r--r--include/Makefile.am2
-rw-r--r--libast.spec9
-rw-r--r--src/Makefile.am3
-rw-r--r--test/Makefile.am3
6 files changed, 16 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index f0bed9b..f5d5ab3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,7 @@ macrodir = $(datadir)/aclocal
10EXTRA_DIST = DESIGN LICENSE README $(MACROS) libast.spec 10EXTRA_DIST = DESIGN LICENSE README $(MACROS) libast.spec
11MAINTAINERCLEANFILES = Makefile.in *~ aclocal.m4 config.guess config.sub configure depcomp \ 11MAINTAINERCLEANFILES = Makefile.in *~ aclocal.m4 config.guess config.sub configure depcomp \
12 install-sh ltconfig ltmain.sh missing mkinstalldirs stamp-h* *.log config.h.in 12 install-sh ltconfig ltmain.sh missing mkinstalldirs stamp-h* *.log config.h.in
13DISTCLEANFILES = Makefile
13 14
14test: all 15test: all
15 cd test && $(MAKE) test 16 cd test && $(MAKE) test
diff --git a/configure.ac b/configure.ac
index a42608f..df8625b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,10 @@
29# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 29# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
30# 30#
31 31
32AC_INIT(configure.ac) 32AC_INIT([LibAST], [0.8.1])
33AM_INIT_AUTOMAKE([libast], [0.8]) 33AC_CONFIG_SRCDIR([configure.ac])
34AM_INIT_AUTOMAKE
35
34AC_DEFINE_UNQUOTED(LIBAST_VERSION, "$VERSION", [Version]) 36AC_DEFINE_UNQUOTED(LIBAST_VERSION, "$VERSION", [Version])
35AC_CONFIG_MACRO_DIR([.]) 37AC_CONFIG_MACRO_DIR([.])
36 38
@@ -39,7 +41,7 @@ AC_CONFIG_FILES([include/libast/types.h Makefile include/Makefile
39 src/Makefile test/Makefile libast-config]) 41 src/Makefile test/Makefile libast-config])
40 42
41dnl# Set some basic variables 43dnl# Set some basic variables
42AUTHORS="Michael Jennings (mej@eterm.org and mej@lbl.gov)" 44AUTHORS="Michael Jennings (mej@eterm.org and mej@lanl.gov)"
43AC_SUBST(AUTHORS) 45AC_SUBST(AUTHORS)
44AC_DEFINE_UNQUOTED(AUTHORS, "$AUTHORS", [Authors]) 46AC_DEFINE_UNQUOTED(AUTHORS, "$AUTHORS", [Authors])
45 47
diff --git a/include/Makefile.am b/include/Makefile.am
index 35c8dd8..468c187 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -17,4 +17,4 @@ libast/sysdefs.h: libast/sysdefs.h.in
17 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ 17 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
18 18
19MAINTAINERCLEANFILES = Makefile.in 19MAINTAINERCLEANFILES = Makefile.in
20DISTCLEANFILES = libast/sysdefs.h libast/types.h 20DISTCLEANFILES = Makefile libast/sysdefs.h libast/types.h
diff --git a/libast.spec b/libast.spec
index 901e618..bbd5615 100644
--- a/libast.spec
+++ b/libast.spec
@@ -1,13 +1,14 @@
1%{!?_rel:%{expand:%%global _rel 0.%(git describe --abbrev=4 --always --tags --long --dirty=.1 | cut -d- -f 2- | tr '-' '.')}}
2
1%define __os_install_post /usr/lib/rpm/brp-compress 3%define __os_install_post /usr/lib/rpm/brp-compress
2%if %{!?optflags:1}0 4%if %{!?optflags:1}0
3%define optflags ${RPM_OPT_FLAGS:--O0 -g3} 5%{expand:%%define optflags %{!?el8:${RPM_OPT_FLAGS:--O0 -g3}}%{?el8:-O2 -ggdb3 -fPIC}}
4%endif 6%endif
5 7
6Summary: Library of Assorted Spiffy Things 8Summary: Library of Assorted Spiffy Things
7Name: libast 9Name: libast
8Version: 0.8 10Version: 0.8.1
9#Release: 1 11Release: %{_rel}%{?dist}
10Release: 0.%(date '+%Y%m%d')
11Group: System Environment/Libraries 12Group: System Environment/Libraries
12License: BSD 13License: BSD
13URL: http://www.eterm.org/ 14URL: http://www.eterm.org/
diff --git a/src/Makefile.am b/src/Makefile.am
index 52cd549..4db1fb1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
2 2
3lib_LTLIBRARIES = libast.la 3lib_LTLIBRARIES = libast.la
4 4
5INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE) -I$(top_builddir)/include 5AM_CPPFLAGS = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE)
6AM_CFLAGS = $(PTHREAD_CFLAGS) 6AM_CFLAGS = $(PTHREAD_CFLAGS)
7AM_LDFLAGS = $(PTHREAD_LIBS) 7AM_LDFLAGS = $(PTHREAD_LIBS)
8 8
@@ -13,3 +13,4 @@ snprintf.c tok.c url.c ustr.c
13 13
14libast_la_LDFLAGS = -version-info 2:2:0 14libast_la_LDFLAGS = -version-info 2:2:0
15MAINTAINERCLEANFILES = Makefile.in 15MAINTAINERCLEANFILES = Makefile.in
16DISTCLEANFILES = Makefile
diff --git a/test/Makefile.am b/test/Makefile.am
index 2fcf71d..624083e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,6 @@
1EXTRA_PROGRAMS = libast-test libast-perf 1EXTRA_PROGRAMS = libast-test libast-perf
2 2
3INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE) 3AM_CPPFLAGS = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE)
4 4
5libast_test_SOURCES = test.c test.h 5libast_test_SOURCES = test.c test.h
6libast_test_DEPENDENCIES = $(top_builddir)/src/libast.la 6libast_test_DEPENDENCIES = $(top_builddir)/src/libast.la
@@ -20,3 +20,4 @@ perf: libast-perf
20 20
21.PHONY: test 21.PHONY: test
22MAINTAINERCLEANFILES = Makefile.in 22MAINTAINERCLEANFILES = Makefile.in
23DISTCLEANFILES = Makefile