aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-03-23 20:52:46 +0000
committerChristian Grothoff <christian@grothoff.org>2015-03-23 20:52:46 +0000
commit807adc01dc9432acf1262e56ebe481c6c39046a8 (patch)
treeca03363cb1034f744861aca8a993ab28b2046352
parente4d9ea2ed20757aaf4c526845907f48b373c7ccd (diff)
downloadlibextractor-807adc01dc9432acf1262e56ebe481c6c39046a8.tar.gz
libextractor-807adc01dc9432acf1262e56ebe481c6c39046a8.zip
-fix encoding of PLUGININSTDIR
-rw-r--r--src/main/Makefile.am44
1 files changed, 23 insertions, 21 deletions
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index dbb0f84..324be00 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -1,7 +1,7 @@
1# This Makefile.am is in the public domain 1# This Makefile.am is in the public domain
2SUBDIRS = . 2SUBDIRS = .
3 3
4INCLUDES = -I$(top_srcdir)/src/include 4INCLUDES = -I$(top_srcdir)/src/include
5 5
6LIBS = \ 6LIBS = \
7 @LE_LIBINTL@ @LE_LIB_LIBS@ 7 @LE_LIBINTL@ @LE_LIB_LIBS@
@@ -12,7 +12,7 @@ if USE_COVERAGE
12endif 12endif
13 13
14lib_LTLIBRARIES = \ 14lib_LTLIBRARIES = \
15 libextractor.la 15 libextractor.la
16 16
17bin_PROGRAMS = extract 17bin_PROGRAMS = extract
18 18
@@ -36,6 +36,9 @@ if HAVE_GNU_LD
36 makesymbolic=-Wl,-Bsymbolic 36 makesymbolic=-Wl,-Bsymbolic
37endif 37endif
38 38
39# install plugins under:
40plugindir = $(libdir)/@RPLUGINDIR@
41
39PLUGINFLAGS = $(makesymbolic) $(LE_PLUGIN_LDFLAGS) 42PLUGINFLAGS = $(makesymbolic) $(LE_PLUGIN_LDFLAGS)
40 43
41EXTRA_DIST = \ 44EXTRA_DIST = \
@@ -64,7 +67,7 @@ libextractor_la_LIBADD = \
64 67
65extract_SOURCES = \ 68extract_SOURCES = \
66 extract.c \ 69 extract.c \
67 getopt.c getopt.h getopt1.c 70 getopt.c getopt.h getopt1.c
68extract_DEPENDENCIES = \ 71extract_DEPENDENCIES = \
69 libextractor.la 72 libextractor.la
70extract_LDADD = \ 73extract_LDADD = \
@@ -75,17 +78,17 @@ TESTS_ENVIRONMENT += bindir=${bindir}
75 78
76noinst_LTLIBRARIES = \ 79noinst_LTLIBRARIES = \
77 libextractor_test.la \ 80 libextractor_test.la \
78 libextractor_test2.la 81 libextractor_test2.la
79 82
80libextractor_test_la_SOURCES = \ 83libextractor_test_la_SOURCES = \
81 test_extractor.c 84 test_extractor.c
82libextractor_test_la_LDFLAGS = \ 85libextractor_test_la_LDFLAGS = \
83 $(PLUGINFLAGS) -rpath /nowhere 86 $(PLUGINFLAGS) -rpath /nowhere
84libextractor_test_la_LIBADD = \ 87libextractor_test_la_LIBADD = \
85 $(LE_LIBINTL) $(XLIB) 88 $(LE_LIBINTL) $(XLIB)
86 89
87libextractor_test2_la_SOURCES = \ 90libextractor_test2_la_SOURCES = \
88 test2_extractor.c 91 test2_extractor.c
89libextractor_test2_la_LDFLAGS = \ 92libextractor_test2_la_LDFLAGS = \
90 $(PLUGINFLAGS) -rpath /nowhere 93 $(PLUGINFLAGS) -rpath /nowhere
91libextractor_test2_la_LIBADD = \ 94libextractor_test2_la_LIBADD = \
@@ -106,37 +109,36 @@ TESTS = $(check_PROGRAMS)
106endif 109endif
107 110
108test_trivial_SOURCES = \ 111test_trivial_SOURCES = \
109 test_trivial.c 112 test_trivial.c
110test_trivial_LDADD = \ 113test_trivial_LDADD = \
111 $(top_builddir)/src/main/libextractor.la 114 $(top_builddir)/src/main/libextractor.la
112 115
113test_plugin_loading_SOURCES = \ 116test_plugin_loading_SOURCES = \
114 test_plugin_loading.c 117 test_plugin_loading.c
115test_plugin_loading_LDADD = \ 118test_plugin_loading_LDADD = \
116 $(top_builddir)/src/main/libextractor.la 119 $(top_builddir)/src/main/libextractor.la
117 120
118test_plugin_load_multi_SOURCES = \ 121test_plugin_load_multi_SOURCES = \
119 test_plugin_load_multi.c 122 test_plugin_load_multi.c
120test_plugin_load_multi_LDADD = \ 123test_plugin_load_multi_LDADD = \
121 $(top_builddir)/src/main/libextractor.la 124 $(top_builddir)/src/main/libextractor.la
122 125
123test_ipc_SOURCES = \ 126test_ipc_SOURCES = \
124 test_ipc.c 127 test_ipc.c
125test_ipc_LDADD = \ 128test_ipc_LDADD = \
126 $(top_builddir)/src/main/libextractor.la 129 $(top_builddir)/src/main/libextractor.la
127 130
128test_file_SOURCES = \ 131test_file_SOURCES = \
129 test_file.c 132 test_file.c
130test_file_LDADD = \ 133test_file_LDADD = \
131 $(top_builddir)/src/main/libextractor.la 134 $(top_builddir)/src/main/libextractor.la
132 135
133test_gzip_SOURCES = \ 136test_gzip_SOURCES = \
134 test_gzip.c 137 test_gzip.c
135test_gzip_LDADD = \ 138test_gzip_LDADD = \
136 $(top_builddir)/src/main/libextractor.la 139 $(top_builddir)/src/main/libextractor.la
137 140
138test_bzip2_SOURCES = \ 141test_bzip2_SOURCES = \
139 test_bzip2.c 142 test_bzip2.c
140test_bzip2_LDADD = \ 143test_bzip2_LDADD = \
141 $(top_builddir)/src/main/libextractor.la 144 $(top_builddir)/src/main/libextractor.la
142