94 lines
3.8 KiB
Text
94 lines
3.8 KiB
Text
$NetBSD: patch-ad,v 1.2 2009/11/30 17:25:08 joerg Exp $
|
|
|
|
--- libdieharder/Makefile.am.orig 2007-05-22 02:34:27.000000000 +0200
|
|
+++ libdieharder/Makefile.am
|
|
@@ -38,10 +38,7 @@ RELEASE=0
|
|
# other stuff in the future) is built.
|
|
PROGMAN = libdieharder.3
|
|
# (FC "requires" no static library build)
|
|
-# PROGLIB_A = libdieharder.a
|
|
-PROGLIB_SO = libdieharder.so
|
|
-PROGLIB_SONAME = libdieharder.so.$(VERSION_MAJOR)
|
|
-PROGLIB_SO_VERSION = libdieharder.so.$(VERSION)
|
|
+PROGLIB_A = libdieharder.a
|
|
|
|
#========================================================================
|
|
# Define all sources. Note that we choose to depend on ALL the includes
|
|
@@ -55,14 +52,8 @@ DEFINES = -DVERSION=$(VERSION)
|
|
#========================================================================
|
|
# Define parameters and directives needed in compile/link steps.
|
|
#========================================================================
|
|
-# C Compiler
|
|
-CC = gcc
|
|
-
|
|
# Compile flags (use fairly standard -O3 as default)
|
|
-CFLAGS = -O3 $(DEFINES) -I ../include
|
|
-
|
|
-# Linker flags
|
|
-LDFLAGS = -g -fpic -shared -Wl,-soname,$(PROGLIB_SONAME)
|
|
+CFLAGS += $(DEFINES) -I ../include
|
|
|
|
# Libraries
|
|
LIBS = -lgsl -lgslcblas -lm
|
|
@@ -72,22 +63,11 @@ LIBS = -lgsl -lgslcblas -lm
|
|
# presume the simplest of dependencies and remake if includes change
|
|
# for example.
|
|
#========================================================================
|
|
-all: $(INCTIME) $(PROGLIB_SO_VERSION) # $(PROGLIB_A)
|
|
|
|
-# This has to ALWAYS run before a build.
|
|
-$(INCTIME):
|
|
- (install -d $(includedir)/dieharder; \
|
|
- install -m 644 ../include/dieharder/*.h $(includedir)/dieharder;)
|
|
-
|
|
-# FC "requires" no static lib build/install
|
|
-# $(PROGLIB_A): $(INCTIME) $(LIBOBJECTS) $(LIBINCLUDES)
|
|
-# ar r $(PROGLIB_A) $(LIBOBJECTS)
|
|
-# ranlib $(PROGLIB_A)
|
|
-
|
|
-$(PROGLIB_SO_VERSION): $(INCTIME) $(LIBOBJECTS) $(LIBINCLUDES)
|
|
- gcc $(LDFLAGS) -o $(PROGLIB_SO_VERSION) $(LIBOBJECTS)
|
|
- ldconfig -n .
|
|
- ln -sf $(PROGLIB_SO_VERSION) $(PROGLIB_SO)
|
|
+all: $(PROGLIB_A)
|
|
+
|
|
+$(PROGLIB_A): $(LIBOBJECTS)
|
|
+ $(LIBTOOL) --mode=link $(CC) -o $(PROGLIB_A:.a=.la) $(LIBOBJECTS:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:0
|
|
|
|
#========================================================================
|
|
# The only safe place to do commits is in the toplevel directory
|
|
@@ -111,7 +91,7 @@ printout:
|
|
# A standard cleanup target
|
|
#========================================================================
|
|
clean:
|
|
- rm -f core $(PROGLIB_SO)* $(LIBOBJECTS) $(PROGMAN).gz
|
|
+ rm -f core $(PROGLIB_A) $(LIBOBJECTS) $(PROGMAN).gz
|
|
|
|
#========================================================================
|
|
# This is critical. For the toplevel rpm build to succeed,
|
|
@@ -120,15 +100,13 @@ clean:
|
|
# This target has to install precisely the files required by the
|
|
# specfile for the dieharder package, in precisely the right locations.
|
|
#========================================================================
|
|
-install: $(PROGLIB_SO_VERSION) $(PROGLIB_A) $(PROGMAN)
|
|
+install: $(PROGLIB_A) $(PROGMAN)
|
|
(install -d $(libdir); \
|
|
- install -m 755 $(PROGLIB_SO_VERSION) $(libdir)/$(PROGLIB_SO_VERSION); \
|
|
- ln -sf $(libdir)/$(PROGLIB_SO_VERSION) $(libdir)/$(PROGLIB_SO); \
|
|
+ $(LIBTOOL) --mode=install install -m 755 $(PROGLIB_A:.a=.la) $(libdir); \
|
|
install -d $(includedir)/dieharder; \
|
|
install -m 644 ../include/dieharder/*.h $(includedir)/dieharder; \
|
|
- install -d $(prefix)/share/man/man3; \
|
|
- gzip -c -9 $(PROGMAN) > $(PROGMAN).gz; \
|
|
- install -m 644 $(DIR).3.gz $(prefix)/share/man/man3)
|
|
+ install -d $(mandir)/man3; \
|
|
+ install -m 644 $(DIR).3 $(mandir)/man3)
|
|
|
|
# FC requires no static lib install
|
|
# install -m 755 $(PROGLIB_A) $(libdir)/$(PROGLIB_A); \
|
|
@@ -138,4 +116,4 @@ install: $(PROGLIB_SO_VERSION) $(PROGLIB
|
|
# objects.
|
|
#========================================================================
|
|
%.o:%.c $(LIBINCLUDES) Makefile
|
|
- $(CC) -fpic -c $(CFLAGS) $<
|
|
+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
|