Restore NUMPRIMES as a numeric literal

[openssl.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 842da882511600d0f6cb46a0d5f7845c5be18157..80d5f175d0cb82d35d13c7d39b6be70e5c262845 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -160,7 +160,6 @@ LIBS=   libcrypto.a libssl.a
 SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
 SHARED_SSL=libssl$(SHLIB_EXT)
 SHARED_LIBS={- '$(SHARED_CRYPTO) $(SHARED_SSL)' if (!$config{no_shared}) -}
-SHARED_LIBS_LINK_EXTS={- $config{shared_link_extensions} -}
 SHARED_LDFLAGS={- $target{shared_ldflag} -}
 
 GENERAL=        Makefile
@@ -312,20 +311,6 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
                exit 1; \
        fi
 
-clean-shared:
-       @set -e; for i in $(SHLIBDIRS); do \
-               if [ -n "$(SHARED_LIBS_LINK_EXTS)" ]; then \
-                       tmp="$(SHARED_LIBS_LINK_EXTS)"; \
-                       for j in $${tmp:-x}; do \
-                               ( set -x; rm -f lib$$i$$j ); \
-                       done; \
-               fi; \
-               ( set -x; rm -f lib$$i$(SHLIB_EXT) ); \
-               if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
-                       ( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
-               fi; \
-       done
-
 link-shared:
        @ set -e; for i in $(SHLIBDIRS); do \
                $(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \
@@ -457,9 +442,9 @@ depend:
 update: generate errors ordinals depend
 
 generate:
-       (cd apps && $(MAKE) generate)
-       (cd crypto/bn && $(MAKE) generate)
-       (cd crypto/objects && $(MAKE) generate)
+       (cd apps && PERL='${PERL}' $(MAKE) generate)
+       (cd crypto/bn && PERL='${PERL}' $(MAKE) generate)
+       (cd crypto/objects && PERL='${PERL}' $(MAKE) generate)
 
 errors:
        $(PERL) util/ck_errf.pl -strict */*.c */*/*.c
@@ -485,15 +470,13 @@ TABLE: Configure Configurations/*.conf
 # and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
 # tar does not support the --files-from option.
 TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from $(TARFILE).list \
-                              --owner 0 --group 0 \
+                              --owner 0 --group 0 \
                               --transform 's|^|$(NAME)/|' \
                               -cvf -
 
 $(TARFILE).list:
-       find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
-              \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \
-              \! -name '*test' \! -name '.#*' \! -name '*~' \! -type l \
-           | sort > $(TARFILE).list
+       git diff --quiet HEAD
+       git ls-files | sort > $(TARFILE).list
 
 tar: $(TARFILE).list
        find . -type d -print | xargs chmod 755