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