Add explicit link to libpthread, to work around debugging issues

[fips] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index cb73ab2ed231a34abe48696298949650105d13d4..817a0a3fb49d3fe0fa7df6918855b0831a3901f5 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -39,10 +39,6 @@ ifeq ($(shell cat .first-build-message 2>/dev/null),)
 endif
 endif
 
-.PHONY: test
-test:
-       @echo "FIXME: Should consider adding a test suite here."
-
 # The user has not set any verbosity, default to quiet mode and inform the
 # user how to enable verbose compiles.
 ifeq ($(V),)
@@ -80,7 +76,8 @@ distclean: clean
 
 fips_srcs = \
        execute.c \
-       fips.c
+       fips.c \
+       xmalloc.c
 
 fips_modules = $(fips_srcs:.c=.o)
 
@@ -93,12 +90,15 @@ LIBRARY_LINK_FLAGS = -shared -Wl,--version-script=libfips.sym
 extra_cflags += -I$(srcdir) -fPIC
 
 libfips_srcs = \
+       context.c \
        dlwrap.c \
        fips-dispatch.c \
        fips-dispatch-gl.c \
        glwrap.c \
        glxwrap.c \
-       metrics.c
+       metrics.c \
+       metrics-info.c \
+       xmalloc.c
 
 ifeq ($(HAVE_EGL),Yes)
 libfips_srcs += eglwrap.c
@@ -122,8 +122,12 @@ install: all
        mkdir -p $(DESTDIR)$(bindir)
        install fips $(DESTDIR)$(bindir)/fips
        mkdir -p $(DESTDIR)$(libdir)/fips
+ifeq ($(COMPILER_SUPPORTS_32), Yes)
        install -m0644 libfips-32.so $(DESTDIR)$(libdir)/fips/libfips-32.so
+endif
+ifeq ($(COMPILER_SUPPORTS_64), Yes)
        install -m0644 libfips-64.so $(DESTDIR)$(libdir)/fips/libfips-64.so
+endif
 ifeq ($(MAKECMDGOALS), install)
        @echo ""
        @echo "Fips is now installed to $(DESTDIR)$(prefix)"
@@ -136,6 +140,5 @@ CLEAN := $(CLEAN) fips $(fips_modules) $(libfips_32_modules) $(libfips_64_module
 DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config
 
 DEPS := $(SRCS:%.c=.deps/%.d)
-DEPS := $(DEPS:%.cc=.deps/%.d)
 
 -include $(DEPS)