diff options
| author | Michael D. Stemle, Jr <themanchicken@gmail.com> | 2018-10-03 22:17:28 -0400 |
|---|---|---|
| committer | Michael D. Stemle, Jr <themanchicken@gmail.com> | 2018-10-03 22:17:28 -0400 |
| commit | 825043515fd5d09509ae212f785b4f9b5975279a (patch) | |
| tree | b25d3fcb03ce46dfe751d41c5275f43c048a5328 | |
| parent | 335617c4c734c88464e5974a71e6b30be83c4bd2 (diff) | |
| download | libfaketime-825043515fd5d09509ae212f785b4f9b5975279a.tar.gz | |
Applying fixes for GNU/Linux, and the MT variant of the library.
| -rw-r--r-- | src/Makefile.am | 20 | ||||
| -rw-r--r-- | test/Makefile.am | 32 |
2 files changed, 19 insertions, 33 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index aedd448..2b9878e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,6 @@ ACLOCAL_AMFLAGS=-I m4 LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIBOBJDIR = "." libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status libtool @@ -12,18 +13,25 @@ if SOLARIS 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 + AM_CFLAGS += -std=gnu99 -Wall -Wextra -Werror -DFAKE_STAT -DFAKE_PTHREAD -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -Wno-nonnull-compare endif LTCFLAGS="" -lib_LTLIBRARIES = libfaketime.la + +lib_LTLIBRARIES = libfaketime.la libfaketimeMT.la libfaketime_la_SOURCES = libfaketime.c +libfaketimeMT_la_SOURCES = libfaketime.c + +bin_PROGRAMS = faketime +faketime_SOURCES = faketime.c + 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 + libfaketime_la_LDFLAGS = -shared -Wl,--version-script=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 + faketime_LDADD = -ldl -lm -lrt -lpthread endif - -bin_PROGRAMS = faketime -faketime_SOURCES = faketime.c diff --git a/test/Makefile.am b/test/Makefile.am index 699b315..4df3a7e 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2,33 +2,18 @@ AM_CFLAGS =-DFAKE_SLEEP AM_LDFLAGS = +bin_PROGRAMS = timetest +timetest_SOURCES = timetest.c + if SOLARIS AM_CFLAGS += -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 + AM_CFLAGS += -std=gnu99 -Wall -Wextra -Werror -DFAKE_STAT -DFAKE_PTHREAD -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -Wno-nonnull-compare + timetest_LDADD = -ldl -lm -lrt -lpthread endif -bin_PROGRAMS = timetest -timetest_SOURCES = timetest.c - -# CC = gcc -# -# CFLAGS = -std=gnu99 -Wall -DFAKE_STAT -Werror -Wextra -# LDFLAGS = -lrt -lpthread -# -# SRC = timetest.c -# OBJ = ${SRC:.c=.o} -# -# all: timetest test -# -# .c.o: -# ${CC} -c ${CFLAGS} $< -# -# timetest: ${OBJ} -# ${CC} -o $@ ${OBJ} ${LDFLAGS} -# test: timetest functest @echo @./test.sh @@ -37,10 +22,3 @@ test: timetest functest functest: ./testframe.sh functests -# clean-local: -# @rm -f ${OBJ} timetest -# -# distclean-local: clean-local -# @echo -# -# .PHONY: all test clean-local distclean-local |