blob: f2421bdfcac3b7e75f66a7388d3bcfce192a3cd3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
|
--- audiofile-0.3.6/configure.ac
+++ audiofile-0.3.6/configure.ac
@@ -160,7 +160,6 @@
audiofile-uninstalled.pc
sfcommands/Makefile
test/Makefile
- gtest/Makefile
examples/Makefile
libaudiofile/Makefile
libaudiofile/alac/Makefile
--- audiofile-0.3.6/libaudiofile/Makefile.am
+++ audiofile-0.3.6/libaudiofile/Makefile.am
@@ -108,10 +108,9 @@
TESTS_ENVIRONMENT = $(top_builddir)/libtool --mode=execute $(VALGRIND) $(VALGRIND_FLAGS)
endif
-LIBGTEST = ../gtest/libgtest.la
-UnitTests_SOURCES = modules/UT_RebufferModule.cpp
-UnitTests_LDADD = libaudiofile.la $(LIBGTEST)
+UnitTests_SOURCES = modules/UT_RebufferModule.cpp $(libaudiofile_la_SOURCES)
+UnitTests_LDADD = $(libaudiofile_la_LIBADD) -lgtest
UnitTests_CPPFLAGS = -I$(top_srcdir)
UnitTests_CXXFLAGS = -fno-rtti -fno-exceptions -DGTEST_HAS_RTTI=0 -DGTEST_HAS_EXCEPTIONS=0
UnitTests_LDFLAGS = -static
--- audiofile-0.3.6/Makefile.am
+++ audiofile-0.3.6/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = gtest libaudiofile sfcommands test examples docs
+SUBDIRS = libaudiofile sfcommands test examples docs
EXTRA_DIST = \
ACKNOWLEDGEMENTS \
--- audiofile-0.3.6/test/Makefile.am
+++ audiofile-0.3.6/test/Makefile.am
@@ -59,79 +59,77 @@
DEPENDENCIES = $(LIBAUDIOFILE)
-LIBGTEST = ../gtest/libgtest.la
-
ADPCM_SOURCES = ADPCM.cpp TestUtilities.cpp TestUtilities.h
-ADPCM_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+ADPCM_LDADD = -lgtest $(LIBAUDIOFILE)
AES_SOURCES = AES.cpp TestUtilities.cpp TestUtilities.h
-AES_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+AES_LDADD = -lgtest $(LIBAUDIOFILE)
ALAC_SOURCES = ALAC.cpp Lossless.h TestUtilities.cpp TestUtilities.h
-ALAC_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+ALAC_LDADD = -lgtest $(LIBAUDIOFILE)
ChannelMatrix_SOURCES = ChannelMatrix.cpp TestUtilities.cpp TestUtilities.h
-ChannelMatrix_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+ChannelMatrix_LDADD = -lgtest $(LIBAUDIOFILE)
Error_SOURCES = Error.cpp TestUtilities.cpp TestUtilities.h
-Error_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+Error_LDADD = -lgtest $(LIBAUDIOFILE)
FLAC_SOURCES = FLAC.cpp Lossless.h TestUtilities.cpp TestUtilities.h
-FLAC_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+FLAC_LDADD = -lgtest $(LIBAUDIOFILE)
FloatToInt_SOURCES = FloatToInt.cpp TestUtilities.cpp TestUtilities.h
-FloatToInt_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+FloatToInt_LDADD = -lgtest $(LIBAUDIOFILE)
Instrument_SOURCES = Instrument.cpp TestUtilities.cpp TestUtilities.h
-Instrument_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+Instrument_LDADD = -lgtest $(LIBAUDIOFILE)
IntToFloat_SOURCES = IntToFloat.cpp TestUtilities.cpp TestUtilities.h
-IntToFloat_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+IntToFloat_LDADD = -lgtest $(LIBAUDIOFILE)
InvalidCompressionFormat_SOURCES = InvalidCompressionFormat.cpp TestUtilities.cpp TestUtilities.h
-InvalidCompressionFormat_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+InvalidCompressionFormat_LDADD = -lgtest $(LIBAUDIOFILE)
InvalidSampleFormat_SOURCES = InvalidSampleFormat.cpp TestUtilities.cpp TestUtilities.h
-InvalidSampleFormat_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+InvalidSampleFormat_LDADD = -lgtest $(LIBAUDIOFILE)
Large_SOURCES = Large.cpp TestUtilities.cpp TestUtilities.h
-Large_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+Large_LDADD = -lgtest $(LIBAUDIOFILE)
Loop_SOURCES = Loop.cpp TestUtilities.cpp TestUtilities.h
-Loop_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+Loop_LDADD = -lgtest $(LIBAUDIOFILE)
Marker_SOURCES = Marker.cpp TestUtilities.cpp TestUtilities.h
-Marker_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+Marker_LDADD = -lgtest $(LIBAUDIOFILE)
Miscellaneous_SOURCES = Miscellaneous.cpp TestUtilities.cpp TestUtilities.h
-Miscellaneous_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+Miscellaneous_LDADD = -lgtest $(LIBAUDIOFILE)
NeXT_SOURCES = NeXT.cpp TestUtilities.cpp TestUtilities.h
-NeXT_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+NeXT_LDADD = -lgtest $(LIBAUDIOFILE)
PCMData_SOURCES = PCMData.cpp TestUtilities.cpp TestUtilities.h
-PCMData_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+PCMData_LDADD = -lgtest $(LIBAUDIOFILE)
PCMMapping_SOURCES = PCMMapping.cpp TestUtilities.cpp TestUtilities.h
-PCMMapping_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+PCMMapping_LDADD = -lgtest $(LIBAUDIOFILE)
Pipe_SOURCES = Pipe.cpp TestUtilities.cpp TestUtilities.h
-Pipe_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+Pipe_LDADD = -lgtest $(LIBAUDIOFILE)
Query_SOURCES = Query.cpp TestUtilities.cpp TestUtilities.h
-Query_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+Query_LDADD = -lgtest $(LIBAUDIOFILE)
SampleFormat_SOURCES = SampleFormat.cpp TestUtilities.cpp TestUtilities.h
-SampleFormat_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+SampleFormat_LDADD = -lgtest $(LIBAUDIOFILE)
Seek_SOURCES = Seek.cpp TestUtilities.cpp TestUtilities.h
-Seek_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+Seek_LDADD = -lgtest $(LIBAUDIOFILE)
Sign_SOURCES = Sign.cpp TestUtilities.cpp TestUtilities.h
-Sign_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+Sign_LDADD = -lgtest $(LIBAUDIOFILE)
VirtualFile_SOURCES = VirtualFile.cpp TestUtilities.cpp TestUtilities.h
-VirtualFile_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+VirtualFile_LDADD = -lgtest $(LIBAUDIOFILE)
floatto24_SOURCES = floatto24.c TestUtilities.cpp TestUtilities.h
|
GitWeb