improve readability of generated Makefile.am files

This commit is contained in:
Brent Cook 2014-11-19 22:02:17 -06:00
parent 1bd0c2fb2e
commit 2103690cbf
5 changed files with 10 additions and 4 deletions

View File

@ -13,3 +13,4 @@ noinst_HEADERS =
if !HAVE_STRTONUM
openssl_SOURCES += strtonum.c
endif

View File

@ -89,7 +89,7 @@ libcompat_la_SOURCES += compat/issetugid_win.c
endif
endif
noinst_HEADERS = des/ncbc_enc.c
noinst_HEADERS =
noinst_HEADERS += compat/arc4random.h
noinst_HEADERS += compat/arc4random_freebsd.h
noinst_HEADERS += compat/arc4random_linux.h
@ -97,5 +97,7 @@ noinst_HEADERS += compat/arc4random_osx.h
noinst_HEADERS += compat/arc4random_solaris.h
noinst_HEADERS += compat/arc4random_win.h
noinst_HEADERS += compat/chacha_private.h
libcrypto_la_SOURCES =
EXTRA_libcrypto_la_SOURCES =

View File

@ -7,3 +7,4 @@ libssl_la_LDFLAGS = -version-info libssl-version
libssl_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS)
libssl_la_SOURCES =
noinst_HEADERS =

View File

@ -10,3 +10,4 @@ LDADD += $(top_builddir)/crypto/libcrypto.la
TESTS =
check_PROGRAMS =
EXTRA_DIST =

View File

@ -382,9 +382,13 @@ crypto_excludes=(
echo "noinst_HEADERS += $i" >> Makefile.am
done
for subdir in $crypto_subdirs; do
echo >> Makefile.am
echo "# ${subdir}" >> Makefile.am
for i in `ls -1 $subdir/*.c|sort`; do
if ! [[ ${crypto_excludes[*]} =~ $i ]]; then
echo "libcrypto_la_SOURCES += $i" >> Makefile.am
else
echo "EXTRA_libcrypto_la_SOURCES += $i" >> Makefile.am
fi
done
headers=`ls -1 $subdir/*.h 2>/dev/null |sort`
@ -394,9 +398,6 @@ crypto_excludes=(
done
fi
done
for i in "${crypto_excludes[@]}"; do
echo "EXTRA_libcrypto_la_SOURCES += ${i}" >> Makefile.am
done
)
# conditional compiles