diff options
27 files changed, 163 insertions, 114 deletions
diff --git a/configure.pl b/configure.pl index 2945e161c..bdeecc24d 100755 --- a/configure.pl +++ b/configure.pl @@ -621,7 +621,6 @@ sub get_module_info $HASH{'libs'} = {}; $HASH{'add'} = {}; - $HASH{'local_only'} = {}; $HASH{'replace'} = {}; $HASH{'ignore'} = {}; @@ -634,10 +633,6 @@ sub get_module_info { $HASH{'name'} = $1 if(/^realname \"(.*)\"/); $HASH{'notes'} = $1 if(/^note \"(.*)\"/); - $HASH{'add'}{$1} = undef if(/^add_file ([\.\w]*)/); - $HASH{'local_only'}{$1} = undef if(/^local_only ([\.\w]*)/); - $HASH{'replace'}{$1} = undef if(/^replace_file ([\.\w]*)/); - $HASH{'ignore'}{$1} = undef if(/^ignore_file ([\.\w]*)/); $HASH{'define'}{$1} = undef if(/^define (\w*)/); $HASH{'define_base'}{$1} = undef if(/^define_base (\w*)/); @@ -688,6 +683,33 @@ sub get_module_info } } + if(/^<add>$/) { + while(1) { + $_ = process($_ = <MODFILE>); + next unless $_; + last if (m@^</add>$@); + $HASH{'add'}{$_} = undef; + } + } + + if(/^<ignore>$/) { + while(1) { + $_ = process($_ = <MODFILE>); + next unless $_; + last if (m@^</ignore>$@); + $HASH{'ignore'}{$_} = undef; + } + } + + if(/^<replace>$/) { + while(1) { + $_ = process($_ = <MODFILE>); + next unless $_; + last if (m@^</replace>$@); + $HASH{'replace'}{$_} = undef; + } + } + # Read in a set of os->extra library mappings if(/^<libs>$/) { while(1) { @@ -1221,9 +1243,6 @@ sub generate_makefile { close MAKEFILE; } -################################################## -# Print a header for a makefile # -################################################## sub print_header { my ($fh, $string) = @_; print $fh '#' x 50, "\n", @@ -1243,20 +1262,11 @@ sub print_unix_makefile { $install_root, $header_dir, $lib_dir, $doc_dir, $lib_list) = @_; - ################################################## - # Some constants # - ################################################## my $__TAB__ = "\t"; - ################################################## - # Make the library linking list # - ################################################## my $link_to = "-lm"; foreach my $lib (@{ $lib_list }) { $link_to .= " -l" . $lib; } - ################################################## - # Generate a few variables # - ################################################## my $lib_flags = '$(LIB_OPT) $(MACH_OPT) $(LANG_FLAGS) $(WARN_FLAGS)'; my $libs = '$(STATIC_LIB)'; @@ -1512,14 +1522,8 @@ sub print_nmake_makefile { $install_root, $header_dir, $lib_dir, $doc_dir, $lib_list) = @_; - ################################################## - # Some constants # - ################################################## my $__TAB__ = "\t"; - ################################################## - # Make the library linking list # - ################################################## my $link_to = ''; foreach my $lib (@{ $lib_list }) { @@ -1528,9 +1532,6 @@ sub print_nmake_makefile { else { $link_to .= ' ' . $lib_full; } } - ################################################## - # Generate a few variables # - ################################################## my $lib_flags = '$(LIB_OPT) $(MACH_OPT) $(LANG_FLAGS) $(WARN_FLAGS)'; my $libs = '$(STATIC_LIB)'; diff --git a/modules/alg_ia32/modinfo.txt b/modules/alg_ia32/modinfo.txt index 68579942c..9aea9ab97 100644 --- a/modules/alg_ia32/modinfo.txt +++ b/modules/alg_ia32/modinfo.txt @@ -2,19 +2,25 @@ realname "Algorithm x86 Assembler" mp_bits 32 -replace_file md4.cpp -replace_file md5.cpp -replace_file sha160.cpp -replace_file serpent.cpp -ignore_file mp_muladd.cpp +<replace> +md4.cpp +md5.cpp +sha160.cpp +serpent.cpp +</replace> -add_file asm_macr.h +<ignore> +mp_muladd.cpp +</ignore> -add_file md4core.S -add_file md5core.S -add_file sha1core.S -add_file serp_asm.S -add_file mp_muladd.S +<add> +asm_macr.h +md4core.S +md5core.S +sha1core.S +serp_asm.S +mp_muladd.S +</add> <arch> ia32 diff --git a/modules/alloc_mmap/modinfo.txt b/modules/alloc_mmap/modinfo.txt index f51e3cb68..a6e79d61f 100644 --- a/modules/alloc_mmap/modinfo.txt +++ b/modules/alloc_mmap/modinfo.txt @@ -2,8 +2,10 @@ realname "Disk Based Allocation System" define ALLOC_MMAP -add_file mmap_mem.cpp -add_file mmap_mem.h +<add> +mmap_mem.cpp +mmap_mem.h +</add> <os> linux diff --git a/modules/comp_bzip2/modinfo.txt b/modules/comp_bzip2/modinfo.txt index 3f1428e2c..3109f290c 100644 --- a/modules/comp_bzip2/modinfo.txt +++ b/modules/comp_bzip2/modinfo.txt @@ -6,8 +6,10 @@ realname "Bzip2 Compressor" define COMPRESSOR_BZIP2 -add_file bzip2.h -add_file bzip2.cpp +<add> +bzip2.h +bzip2.cpp +</add> <libs> all -> bz2 diff --git a/modules/comp_zlib/modinfo.txt b/modules/comp_zlib/modinfo.txt index 32acec513..643cfb44f 100644 --- a/modules/comp_zlib/modinfo.txt +++ b/modules/comp_zlib/modinfo.txt @@ -6,8 +6,11 @@ uses_external_libs define COMPRESSOR_ZLIB #define COMPRESSOR_GZIP -add_file zlib.h -add_file zlib.cpp +<add> +zlib.h +zlib.cpp +</add> + #add_file gzip.h #add_file gzip.cpp diff --git a/modules/eng_aep/modinfo.txt b/modules/eng_aep/modinfo.txt index b84790b97..0e7bba99b 100644 --- a/modules/eng_aep/modinfo.txt +++ b/modules/eng_aep/modinfo.txt @@ -2,17 +2,15 @@ realname "AEP Engine" uses_external_libs -add_file eng_aep.cpp -add_file aep_main.cpp -add_file aep_conn.cpp - -add_file eng_aep.h -add_file es_aep.h -add_file hw_aep.h -add_file aep_conn.h - -local_only aep_conn.h -local_only hw_aep.h +<add> +eng_aep.cpp +aep_main.cpp +aep_conn.cpp +eng_aep.h +es_aep.h +hw_aep.h +aep_conn.h +</add> define ENGINE_AEP define ENTROPY_SRC_AEP diff --git a/modules/eng_gmp/modinfo.txt b/modules/eng_gmp/modinfo.txt index 0e7d5465d..b8a709fa1 100644 --- a/modules/eng_gmp/modinfo.txt +++ b/modules/eng_gmp/modinfo.txt @@ -2,15 +2,14 @@ realname "GMP Engine" uses_external_libs -add_file eng_gmp.cpp -add_file gmp_wrap.cpp -add_file gmp_mem.cpp -add_file gmp_powm.cpp - -add_file eng_gmp.h -add_file gmp_wrap.h - -local_only gmp_wrap.h +<add> +eng_gmp.cpp +gmp_wrap.cpp +gmp_mem.cpp +gmp_powm.cpp +eng_gmp.h +gmp_wrap.h +</add> define ENGINE_GNU_MP diff --git a/modules/eng_ossl/modinfo.txt b/modules/eng_ossl/modinfo.txt index 8d32bf247..facad8a72 100644 --- a/modules/eng_ossl/modinfo.txt +++ b/modules/eng_ossl/modinfo.txt @@ -2,17 +2,16 @@ realname "OpenSSL Engine" uses_external_libs -add_file eng_ossl.cpp -add_file bn_wrap.cpp -add_file bn_powm.cpp -add_file ossl_bc.cpp -add_file ossl_rc4.cpp -add_file ossl_md.cpp - -add_file eng_ossl.h -add_file bn_wrap.h - -local_only bn_wrap.h +<add> +eng_ossl.cpp +bn_wrap.cpp +bn_powm.cpp +ossl_bc.cpp +ossl_rc4.cpp +ossl_md.cpp +eng_ossl.h +bn_wrap.h +</add> define ENGINE_OPENSSL diff --git a/modules/es_beos/modinfo.txt b/modules/es_beos/modinfo.txt index 717978417..7587a8b14 100644 --- a/modules/es_beos/modinfo.txt +++ b/modules/es_beos/modinfo.txt @@ -2,8 +2,10 @@ realname "BeOS Entropy Source" define ENTROPY_SRC_BEOS -add_file es_beos.h -add_file es_beos.cpp +<add> +es_beos.h +es_beos.cpp +</add> <os> beos diff --git a/modules/es_capi/modinfo.txt b/modules/es_capi/modinfo.txt index a61e33834..fb9c37744 100644 --- a/modules/es_capi/modinfo.txt +++ b/modules/es_capi/modinfo.txt @@ -2,8 +2,10 @@ realname "Win32 CryptoAPI Entropy Source" define ENTROPY_SRC_CAPI -add_file es_capi.h -add_file es_capi.cpp +<add> +es_capi.h +es_capi.cpp +</add> # We'll just assume CAPI is there; this is OK except for 3.x, early versions # of 95, and maybe NT 3.5 diff --git a/modules/es_egd/modinfo.txt b/modules/es_egd/modinfo.txt index 7ba68274d..1df29117d 100644 --- a/modules/es_egd/modinfo.txt +++ b/modules/es_egd/modinfo.txt @@ -2,8 +2,10 @@ realname "EGD Entropy Source" define ENTROPY_SRC_EGD -add_file es_egd.h -add_file es_egd.cpp +<add> +es_egd.h +es_egd.cpp +</add> <libs> solaris -> socket diff --git a/modules/es_ftw/modinfo.txt b/modules/es_ftw/modinfo.txt index d68ac7ac9..49364a963 100644 --- a/modules/es_ftw/modinfo.txt +++ b/modules/es_ftw/modinfo.txt @@ -2,8 +2,10 @@ realname "File Tree Walking Entropy Source" define ENTROPY_SRC_FTW -add_file es_ftw.h -add_file es_ftw.cpp +<add> +es_ftw.h +es_ftw.cpp +</add> <os> aix diff --git a/modules/es_unix/modinfo.txt b/modules/es_unix/modinfo.txt index e38909e36..a728a6df1 100644 --- a/modules/es_unix/modinfo.txt +++ b/modules/es_unix/modinfo.txt @@ -2,12 +2,13 @@ realname "Generic Unix Entropy Source" define ENTROPY_SRC_UNIX -add_file es_unix.cpp -add_file unix_src.cpp -add_file unix_cmd.cpp - -add_file es_unix.h -add_file unix_cmd.h +<add> +es_unix.cpp +unix_src.cpp +unix_cmd.cpp +es_unix.h +unix_cmd.h +</add> <os> aix diff --git a/modules/es_win32/modinfo.txt b/modules/es_win32/modinfo.txt index 67e1a6ec0..57e516920 100644 --- a/modules/es_win32/modinfo.txt +++ b/modules/es_win32/modinfo.txt @@ -5,8 +5,10 @@ realname "MS Windows Entropy Source" define ENTROPY_SRC_WIN32 -add_file es_win32.h -add_file es_win32.cpp +<add> +es_win32.h +es_win32.cpp +</add> <os> windows diff --git a/modules/fd_unix/modinfo.txt b/modules/fd_unix/modinfo.txt index 062b93cca..88147cf8d 100644 --- a/modules/fd_unix/modinfo.txt +++ b/modules/fd_unix/modinfo.txt @@ -2,8 +2,10 @@ realname "Pipe Unix I/O support" define PIPE_UNIXFD_IO -add_file fd_unix.h -add_file fd_unix.cpp +<add> +fd_unix.h +fd_unix.cpp +</add> <os> aix diff --git a/modules/ml_unix/modinfo.txt b/modules/ml_unix/modinfo.txt index bc05f0d08..c7f8945bb 100644 --- a/modules/ml_unix/modinfo.txt +++ b/modules/ml_unix/modinfo.txt @@ -1,6 +1,8 @@ realname "Memory Locking for Unix" -replace_file mlock.cpp +<replace> +mlock.cpp +</replace> <os> aix diff --git a/modules/ml_win32/modinfo.txt b/modules/ml_win32/modinfo.txt index 31b5d2afa..91c3e63db 100644 --- a/modules/ml_win32/modinfo.txt +++ b/modules/ml_win32/modinfo.txt @@ -1,6 +1,8 @@ realname "Memory Locking for Windows" -replace_file mlock.cpp +<replace> +mlock.cpp +</replace> <os> windows diff --git a/modules/mp_amd64/modinfo.txt b/modules/mp_amd64/modinfo.txt index 12537da0e..2ff4d771d 100644 --- a/modules/mp_amd64/modinfo.txt +++ b/modules/mp_amd64/modinfo.txt @@ -2,8 +2,10 @@ realname "MPI Assembler Backend for x86-64/AMD64 Systems" mp_bits 64 -replace_file mp_asm.h -replace_file mp_asmi.h +<replace> +mp_asm.h +mp_asmi.h +</replace> <arch> amd64 diff --git a/modules/mp_asm64/modinfo.txt b/modules/mp_asm64/modinfo.txt index 203608d9e..469a20634 100644 --- a/modules/mp_asm64/modinfo.txt +++ b/modules/mp_asm64/modinfo.txt @@ -2,7 +2,9 @@ realname "MPI Assembler Backend for 64 bit Systems" mp_bits 64 -replace_file mp_asm.h +<replace> +mp_asm.h +</replace> # Disable amd64 since (nominally) the mp_amd64 module has that covered <arch> diff --git a/modules/mp_ia32/modinfo.txt b/modules/mp_ia32/modinfo.txt index ff2114fd8..2c23efb03 100644 --- a/modules/mp_ia32/modinfo.txt +++ b/modules/mp_ia32/modinfo.txt @@ -2,8 +2,10 @@ realname "MPI Assembler Backend for x86 Systems" mp_bits 32 -replace_file mp_asm.h -replace_file mp_asmi.h +<replace> +mp_asm.h +mp_asmi.h +</replace> <arch> ia32 diff --git a/modules/mux_pthr/modinfo.txt b/modules/mux_pthr/modinfo.txt index 0aeca05d6..6d3e157d9 100644 --- a/modules/mux_pthr/modinfo.txt +++ b/modules/mux_pthr/modinfo.txt @@ -2,8 +2,10 @@ realname "Pthread Mutex" define MUTEX_PTHREAD -add_file mux_pthr.cpp -add_file mux_pthr.h +<add> +mux_pthr.cpp +mux_pthr.h +</add> <libs> all!qnx,freebsd,openbsd,netbsd -> pthread diff --git a/modules/mux_qt/modinfo.txt b/modules/mux_qt/modinfo.txt index 6a6f70e5b..77b3e8298 100644 --- a/modules/mux_qt/modinfo.txt +++ b/modules/mux_qt/modinfo.txt @@ -4,12 +4,16 @@ define MUTEX_QT note "You'll probably have to add -I/-L flags to the Makefile to find Qt" -replace_file types.h +<replace> +types.h +</replace> uses_external_libs -add_file mux_qt.cpp -add_file mux_qt.h +<add> +mux_qt.cpp +mux_qt.h +</add> # I think we want to always use qt-mt, not qt -- not much point in supporting # mutexes in a single threaded application, after all. diff --git a/modules/mux_win32/modinfo.txt b/modules/mux_win32/modinfo.txt index ed8d688b3..a88036419 100644 --- a/modules/mux_win32/modinfo.txt +++ b/modules/mux_win32/modinfo.txt @@ -2,8 +2,10 @@ realname "Win32 Mutex" define MUTEX_WIN32 -add_file mux_win32.cpp -add_file mux_win32.h +<add> +mux_win32.cpp +mux_win32.h +</add> <os> cygwin diff --git a/modules/tm_hard/modinfo.txt b/modules/tm_hard/modinfo.txt index d03df5d30..788eb85ff 100644 --- a/modules/tm_hard/modinfo.txt +++ b/modules/tm_hard/modinfo.txt @@ -2,8 +2,10 @@ realname "Hardware Timer" define TIMER_HARDWARE -add_file tm_hard.cpp -add_file tm_hard.h +<add> +tm_hard.cpp +tm_hard.h +</add> <cc> gcc diff --git a/modules/tm_posix/modinfo.txt b/modules/tm_posix/modinfo.txt index df8d63122..f01d25094 100644 --- a/modules/tm_posix/modinfo.txt +++ b/modules/tm_posix/modinfo.txt @@ -2,8 +2,10 @@ realname "POSIX Timer" define TIMER_POSIX -add_file tm_posix.cpp -add_file tm_posix.h +<add> +tm_posix.cpp +tm_posix.h +</add> <libs> linux -> rt diff --git a/modules/tm_unix/modinfo.txt b/modules/tm_unix/modinfo.txt index 78400fbc9..73f3fae22 100644 --- a/modules/tm_unix/modinfo.txt +++ b/modules/tm_unix/modinfo.txt @@ -2,8 +2,10 @@ realname "Unix Timer" define TIMER_UNIX -add_file tm_unix.cpp -add_file tm_unix.h +<add> +tm_unix.cpp +tm_unix.h +</add> <os> aix diff --git a/modules/tm_win32/modinfo.txt b/modules/tm_win32/modinfo.txt index db9c4d9b8..27d43c4ef 100644 --- a/modules/tm_win32/modinfo.txt +++ b/modules/tm_win32/modinfo.txt @@ -2,8 +2,10 @@ realname "Win32 Timer" define TIMER_WIN32 -add_file tm_win32.cpp -add_file tm_win32.h +<add> +tm_win32.cpp +tm_win32.h +</add> <os> cygwin |