summaryrefslogtreecommitdiff
path: root/src/Makefile_Evil.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-04 20:55:12 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-04 20:55:12 +0000
commit2b29626d8d5aa47119759d0ef1d0876674f06254 (patch)
tree13622da45e0f86f8fde5bc8d50e953e958495691 /src/Makefile_Evil.am
parent7abf31c88264c2a7692ce61c7985bc49e979163e (diff)
efl: fix make dist.
Carefully compared 'svn export' and 'make dist' results and couple of files were missing. Changes: * Makefile.am: removed all .pc from EXTRA_DIST, we shouldn't distribute them here as they will contain ./configure data such as install location. * src/Makefile.am: moved all if-endif to files, otherwise EXTRA_DIST won't work properly. We must EXTRA_DIST outside of the if-endif block. * static_libs/liblinebreak: removed couple of unused files. SVN revision: 82241
Diffstat (limited to 'src/Makefile_Evil.am')
-rw-r--r--src/Makefile_Evil.am11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index b0ed2a8dfd..6f7184ffc7 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -1,4 +1,5 @@
1 1
2if HAVE_WINDOWS
2### Library 3### Library
3 4
4lib_LTLIBRARIES += lib/evil/libevil.la lib/evil/libdl.la 5lib_LTLIBRARIES += lib/evil/libevil.la lib/evil/libdl.la
@@ -119,8 +120,6 @@ lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@
119lib_evil_libdl_la_LIBADD = lib/evil/libevil.la @EVIL_DLFCN_LIBS@ 120lib_evil_libdl_la_LIBADD = lib/evil/libevil.la @EVIL_DLFCN_LIBS@
120lib_evil_libdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 121lib_evil_libdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
121 122
122EXTRA_DIST += lib/evil/gdtoa/README lib/evil/gdtoa/README.mingw
123
124### Binary 123### Binary
125 124
126bin_PROGRAMS += bin/evil/evil_suite bin/evil/test_evil 125bin_PROGRAMS += bin/evil/evil_suite bin/evil/test_evil
@@ -152,7 +151,7 @@ bin/evil/evil_test_util.h
152if HAVE_WINCE 151if HAVE_WINCE
153bin_evil_evil_suite_SOURCES += bin/evil/memcpy_glibc_arm.S 152bin_evil_evil_suite_SOURCES += bin/evil/memcpy_glibc_arm.S
154#else 153#else
155#suite_SOURCES += bin/evil/memcpy_glibc_i686.S 154#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST below!
156endif 155endif
157 156
158bin_evil_evil_suite_CPPFLAGS = \ 157bin_evil_evil_suite_CPPFLAGS = \
@@ -171,3 +170,9 @@ bin_evil_test_evil_SOURCES = bin/evil/test_evil.c
171bin_evil_test_evil_LDADD = \ 170bin_evil_test_evil_LDADD = \
172lib/evil/libevil.la \ 171lib/evil/libevil.la \
173@EVIL_LDFLAGS@ 172@EVIL_LDFLAGS@
173
174endif
175EXTRA_DIST += \
176lib/evil/gdtoa/README \
177lib/evil/gdtoa/README.mingw \
178bin/evil/memcpy_glibc_i686.S