diff options
| author | Zack Weinberg <zackw@panix.com> | 2018-07-04 15:07:31 -0400 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2018-07-04 21:52:19 -0400 |
| commit | 1a51a81abc609c1a48edb2f4c0887e892e9e968f (patch) | |
| tree | dffd3feb8272a19aa8dbacd3f7b1becab461e004 /Makefile.am | |
| parent | fd45d0e95045b49a80a87bfa184fc9be90336779 (diff) | |
| download | libxcrypt-1a51a81abc609c1a48edb2f4c0887e892e9e968f.tar.gz libxcrypt-1a51a81abc609c1a48edb2f4c0887e892e9e968f.tar.bz2 libxcrypt-1a51a81abc609c1a48edb2f4c0887e892e9e968f.zip | |
Check in alg-des-tables.c, don't run gen-des-tables at build time.
This eliminates a whole bunch of dodgy logic from
Makefile.am (Automake doesn't fully comprehend the distinction between
CC and CC_FOR_BUILD) and will also make it easier to support enabling
and disabling of individual hashes without needing AM_CONDITIONALs for
each.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am index c219bac..71fbd62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -114,7 +114,7 @@ check_PROGRAMS = \ if ENABLE_WEAK_HASHES libcrypt_la_SOURCES += \ - crypt-des.c crypt-md5.c alg-des.c alg-md5.c + crypt-des.c crypt-md5.c alg-des.c alg-des-tables.c alg-md5.c if ENABLE_WEAK_NON_GLIBC_HASHES libcrypt_la_SOURCES += \ @@ -122,30 +122,6 @@ libcrypt_la_SOURCES += \ alg-hmac-sha1.c alg-md4.c alg-sha1.c endif -nodist_libcrypt_la_SOURCES = \ - alg-des-tables.c -CLEANFILES += alg-des-tables.c alg-des-tables.c.T - -noinst_PROGRAMS = gen-des-tables - -LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \ - $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) -o $@ - -gen-des-tables$(BUILD_EXEEXT): $(gen_des_tables_OBJECTS) - @rm -f gen-des-tables$(BUILD_EXEEXT) - $(AM_V_CCLD)$(LINK_FOR_BUILD) $(gen_des_tables_OBJECTS) $(gen_des_tables_LDADD) $(LIBS) -# suppress the built-in rule for -gen-des-tables$(EXEEXT): - -$(gen_des_tables_OBJECTS) : CC=$(CC_FOR_BUILD) -$(gen_des_tables_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) -$(gen_des_tables_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -$(gen_des_tables_OBJECTS) : AM_CFLAGS=$(WARN_CFLAGS_FOR_BUILD) - -alg-des-tables.c: gen-des-tables - $(AM_V_GEN)./gen-des-tables$(BUILD_EXEEXT) > alg-des-tables.c.T - $(AM_V_at)mv -f alg-des-tables.c.T alg-des-tables.c - check_PROGRAMS += \ test-alg-des test-alg-md5 test-crypt-des test-crypt-md5 \ test-crypt-badsalt |