Lines 1-14
Link Here
|
1 |
--- Makefile.orig 2018-08-24 18:41:47 UTC |
1 |
--- Makefile.orig 2020-12-28 20:09:24 UTC |
2 |
+++ Makefile |
2 |
+++ Makefile |
3 |
@@ -1,7 +1,7 @@ |
|
|
4 |
# ---------------------------------------------------------------------------- |
5 |
# |
6 |
# Copyright (C) 2006-2018 Fons Adriaensen <fons@linuxaudio.org> |
7 |
-# |
8 |
+# |
9 |
# This program is free software; you can redistribute it and/or modify |
10 |
# it under the terms of the GNU General Public License as published by |
11 |
# the Free Software Foundation; either version 3 of the License, or |
12 |
@@ -20,10 +20,9 @@ |
3 |
@@ -20,10 +20,9 @@ |
13 |
|
4 |
|
14 |
# Modify as required. |
5 |
# Modify as required. |
Lines 20-36
Link Here
|
20 |
+LIBDIR ?= $(PREFIX)/lib |
11 |
+LIBDIR ?= $(PREFIX)/lib |
21 |
|
12 |
|
22 |
MAJVERS = 1 |
13 |
MAJVERS = 1 |
23 |
MINVERS = 6.2 |
14 |
MINVERS = 8.0 |
24 |
@@ -33,8 +32,7 @@ DISTDIR = zita-resampler-$(VERSION) |
15 |
@@ -33,7 +32,6 @@ DISTDIR = zita-resampler-$(VERSION) |
25 |
|
|
|
26 |
CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS |
16 |
CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS |
|
|
17 |
CPPFLAGS += -DENABLE_SSE2 |
27 |
CXXFLAGS += -Wall -fPIC -O2 -ffast-math |
18 |
CXXFLAGS += -Wall -fPIC -O2 -ffast-math |
28 |
-CXXFLAGS += -march=native |
19 |
-CXXFLAGS += -march=native |
29 |
-LDFLAGS += |
20 |
LDFLAGS += |
30 |
+LDFLAGS += |
|
|
31 |
LDLIBS += |
21 |
LDLIBS += |
32 |
|
22 |
|
33 |
|
|
|
34 |
@@ -46,6 +44,7 @@ ZITA-RESAMPLER_O = resampler.o vresampler.o resampler- |
23 |
@@ -46,6 +44,7 @@ ZITA-RESAMPLER_O = resampler.o vresampler.o resampler- |
35 |
ZITA-RESAMPLER_H = zita-resampler/resampler.h zita-resampler/resampler-table.h \ |
24 |
ZITA-RESAMPLER_H = zita-resampler/resampler.h zita-resampler/resampler-table.h \ |
36 |
zita-resampler/vresampler.h zita-resampler/cresampler.h |
25 |
zita-resampler/vresampler.h zita-resampler/cresampler.h |
Lines 39-45
Link Here
|
39 |
|
28 |
|
40 |
$(ZITA-RESAMPLER_MIN): $(ZITA-RESAMPLER_O) |
29 |
$(ZITA-RESAMPLER_MIN): $(ZITA-RESAMPLER_O) |
41 |
$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-RESAMPLER_MAJ) -o $(ZITA-RESAMPLER_MIN) $(ZITA-RESAMPLER_O) $(ZITA-RESAMPLER_DEP) |
30 |
$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-RESAMPLER_MAJ) -o $(ZITA-RESAMPLER_MIN) $(ZITA-RESAMPLER_O) $(ZITA-RESAMPLER_DEP) |
42 |
@@ -56,9 +55,10 @@ $(ZITA-RESAMPLER_O): $(ZITA-RESAMPLER_H) |
31 |
@@ -56,9 +55,9 @@ $(ZITA-RESAMPLER_O): $(ZITA-RESAMPLER_H) |
43 |
install: $(ZITA-RESAMPLER_MIN) |
32 |
install: $(ZITA-RESAMPLER_MIN) |
44 |
install -d $(DESTDIR)$(INCDIR)/zita-resampler |
33 |
install -d $(DESTDIR)$(INCDIR)/zita-resampler |
45 |
install -d $(DESTDIR)$(LIBDIR) |
34 |
install -d $(DESTDIR)$(LIBDIR) |
Lines 48-54
Link Here
|
48 |
- ldconfig |
37 |
- ldconfig |
49 |
+ ${BSD_INSTALL_DATA} -m 644 $(ZITA-RESAMPLER_H) $(DESTDIR)$(INCDIR)/zita-resampler |
38 |
+ ${BSD_INSTALL_DATA} -m 644 $(ZITA-RESAMPLER_H) $(DESTDIR)$(INCDIR)/zita-resampler |
50 |
+ ${BSD_INSTALL_LIB} -m 755 $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR) |
39 |
+ ${BSD_INSTALL_LIB} -m 755 $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR) |
51 |
+ # ldconfig |
|
|
52 |
+ ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_MAJ) |
40 |
+ ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_MAJ) |
53 |
ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_SO) |
41 |
ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_SO) |
54 |
|
42 |
|