X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=Makefile.local;h=2f9b5f0a19e2e8d10aafafeeb63b055c19fa903f;hb=c0c549440d852153d1777eca3fa962c1b70483b3;hp=3dd793271a02ae49775e8181d853ba534f439c46;hpb=b32aa136d3e51a250e58c0fc28162b5e5fd52f67;p=fips

diff --git a/Makefile.local b/Makefile.local
index 3dd7932..2f9b5f0 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -75,22 +75,25 @@ fips: $(fips_modules)
 	$(call quiet,$(FINAL_FIPS_LINKER) $(CFLAGS)) $(FINAL_CFLAGS) $^ $(FINAL_FIPS_LDFLAGS) -o $@
 
 # GL-wrapper library, libfips
-LIBRARY_LINK_FLAGS = -shared -Wl,--version-script=libfips.sym,--no-undefined
+LIBRARY_LINK_FLAGS = -shared -Wl,--version-script=libfips.sym
 
 extra_cflags += -I$(srcdir) -fPIC
 
 libfips_srcs = \
-	glxwrap.c
+	dlwrap.c \
+	glwrap.c \
+	glxwrap.c \
+	metrics.c
 
 libfips_32_modules = $(libfips_srcs:.c=-32.o)
 
 libfips_64_modules = $(libfips_srcs:.c=-64.o)
 
 libfips-32.so: $(libfips_32_modules) libfips.sym
-	$(call quiet,$(FINAL_FIPS_LINKER) $(CFLAGS) -m32) $(FINAL_CFLAGS) -m32 $(libfips_32_modules) $(FINAL_LIBFIPS_LDFLAGS) $(LIBRARY_LINK_FLAGS) -o $@
+	$(call quiet,$(FINAL_FIPS_LINKER) $(CFLAGS) -m32) -o $@ $(FINAL_CFLAGS) -m32 $(libfips_32_modules)  $(LIBRARY_LINK_FLAGS) $(FINAL_LIBFIPS_LDFLAGS)
 
 libfips-64.so: $(libfips_64_modules) libfips.sym
-	$(call quiet,$(FINAL_FIPS_LINKER) $(CFLAGS) -m64) $(FINAL_CFLAGS) -m64 $(libfips_64_modules) $(FINAL_LIBFIPS_LDFLAGS) $(LIBRARY_LINK_FLAGS) -o $@
+	$(call quiet,$(FINAL_FIPS_LINKER) $(CFLAGS) -m64) -o $@ $(FINAL_CFLAGS) -m64 $(libfips_64_modules) $(LIBRARY_LINK_FLAGS) $(FINAL_LIBFIPS_LDFLAGS)
 
 .PHONY: install
 install: all