summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen Dettmer <steffen.dettmer@rail.bombardier.com>2020-04-09 16:59:16 +0200
committerSteffen Dettmer <steffen.dettmer@rail.bombardier.com>2020-04-09 17:43:10 +0200
commit6c0947c86e9625e8811471a968338f59b3f19ed3 (patch)
tree1fd4fe0de6c982749496eb38605ee32a956f5160
parentb36ad2342ccae7c85491dbf053fe01061f47ffcc (diff)
downloadlibfaketime-6c0947c86e9625e8811471a968338f59b3f19ed3.tar.gz
Fixed make distcheck (#250)
-rw-r--r--Makefile.am1
-rw-r--r--src/Makefile.am8
-rw-r--r--test/Makefile.am8
3 files changed, 11 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index de4093f..bef020c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS=-I m4
SUBDIRS=src test man
+EXTRA_DIST=README.developers README.OSX README.packagers TODO
diff --git a/src/Makefile.am b/src/Makefile.am
index 7a2eeaf..33fcc59 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@ AM_LDFLAGS =
if SOLARIS
AM_CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
- AM_LDFLAGS += -Wl,--version-script=libfaketime.map
+ AM_LDFLAGS += -Wl,--version-script=@srcdir@/libfaketime.map
endif
if !MACOS
AM_CFLAGS += -std=gnu99 -Wall -Wextra -Werror -DFAKE_STAT -DFAKE_PTHREAD -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -Wno-nonnull-compare
@@ -18,9 +18,11 @@ endif
LTCFLAGS=""
+EXTRA_DIST=libfaketime.map
lib_LTLIBRARIES = libfaketime.la libfaketimeMT.la
libfaketime_la_SOURCES = libfaketime.c
libfaketimeMT_la_SOURCES = libfaketime.c
+noinst_HEADERS = faketime_common.h sunos_endian.h time_ops.h uthash.h
bin_PROGRAMS = faketime
faketime_SOURCES = faketime.c
@@ -29,9 +31,9 @@ if MACOS
libfaketime_la_LDFLAGS = -dynamiclib -current_version 0.9.8 -compatibility_version 0.7
else
libfaketime_la_LIBADD = -ldl -lm -lrt -lpthread
- libfaketime_la_LDFLAGS = -shared -Wl,--version-script=libfaketime.map
+ libfaketime_la_LDFLAGS = -shared -Wl,--version-script=@srcdir@/libfaketime.map
libfaketimeMT_la_LIBADD = -ldl -lm -lrt -lpthread
libfaketimeMT_la_CFLAGS = -DPTHREAD_SINGLETHREADED_TIME
- libfaketimeMT_la_LDFLAGS = -shared -Wl,--version-script=libfaketime.map -DPTHREAD_SINGLETHREADED_TIME
+ libfaketimeMT_la_LDFLAGS = -shared -Wl,--version-script=@srcdir@/libfaketime.map -DPTHREAD_SINGLETHREADED_TIME
faketime_LDADD = -ldl -lm -lrt -lpthread
endif
diff --git a/test/Makefile.am b/test/Makefile.am
index 6bcf27c..f2257fd 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,16 +1,18 @@
-AM_CFLAGS =-DFAKE_SLEEP -DFAKE_INTERNAL_CALLS -I../ -I../src
+AM_CPPFLAGS =-DFAKE_SLEEP -DFAKE_INTERNAL_CALLS -I@top_srcdir@/src
+AM_CFLAGS =
AM_LDFLAGS =
bin_PROGRAMS = timetest
timetest_SOURCES = timetest.c
if SOLARIS
- AM_CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
+ AM_CPPFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
AM_LDFLAGS += -Wl,--version-script=libfaketime.map
endif
if !MACOS
- AM_CFLAGS += -std=gnu99 -Wall -Wextra -Werror -DFAKE_STAT -DFAKE_PTHREAD -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -Wno-nonnull-compare
+ AM_CPPFLAGS += -DFAKE_STAT -DFAKE_PTHREAD -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS
+ AM_CFLAGS += -std=gnu99 -Wall -Wextra -Werror -fPIC -Wno-nonnull-compare
timetest_LDADD = -ldl -lm -lrt -lpthread
endif