Simplify dependency rules using GNU make -include.

* aclocal.m4 (DEP_INCLUDE): Delete substituted variable.

* Makefile.in: Use the GNU make directive -include to include
dependency .d files. Delete dependency files on make clean.
* examples/Makefile.in: Likewise.
* testsuite/Makefile.in: Likewise. Also use $(OBJEXT) properly.
* tools/Makefile.in: Likewise.

* configure.ac (dummy-dep-files): Delete these config commands.

diff --git a/ChangeLog b/ChangeLog
index 4fc3d99fed4bf2a71e69ced7675bc661b1b24fec..75be32a5075eb0f17d627cd081c1e2fb572796b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2020-01-15  Niels Möller  <nisse@lysator.liu.se>
+
+       * aclocal.m4 (DEP_INCLUDE): Delete substituted variable.
+
+       * Makefile.in: Use the GNU make directive -include to include
+       dependency .d files. Delete dependency files on make clean.
+       * examples/Makefile.in: Likewise.
+       * testsuite/Makefile.in: Likewise. Also use $(OBJEXT) properly.
+       * tools/Makefile.in: Likewise.
+
+       * configure.ac (dummy-dep-files): Delete these config commands.
+
 2020-01-10  Niels Möller  <nisse@lysator.liu.se>
 
        From Dmitry Eremin-Solenikov: Consistently rename ecc files and

diff --git a/Makefile.in b/Makefile.in
index 38160bb40fe1fb1749292ad83d107c829dd6ef90..21d1c77dfcd89da36db5ef173ab41faecf325aae 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -658,7 +658,7 @@ distcheck: dist
        $(rm_distcheck)
 
 clean-here:
-       -rm -f $(TARGETS) *.$(OBJEXT) *.s *.so *.dll *.a \
+       -rm -f $(TARGETS) *.$(OBJEXT) *.$(OBJEXT).d *.s *.so *.dll *.a \
                ecc-curve25519.h ecc-curve448.h \
                ecc-secp192r1.h ecc-secp224r1.h ecc-secp256r1.h \
                ecc-secp384r1.h ecc-secp521r1.h \
@@ -683,4 +683,4 @@ tags-here:
        etags -o $(srcdir)/TAGS $(srcdir)/*.c $(srcdir)/*.h
 
 DEP_FILES = $(SOURCES:.c=.$(OBJEXT).d)
-@DEP_INCLUDE@ $(DEP_FILES)
+-include $(DEP_FILES)

diff --git a/aclocal.m4 b/aclocal.m4
index 9b1ff6f4869a6e0ece338a1db2ffee3154bb7eab..df2d84dee38764c9801eca02f34f3c75a8c70c4f 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -456,13 +456,6 @@ if test x$enable_dependency_tracking = xyes ; then
   fi
 fi
 
-if test x$enable_dependency_tracking = xyes ; then
-  DEP_INCLUDE='include '
-else
-  DEP_INCLUDE='# '
-fi
-
-AC_SUBST([DEP_INCLUDE])
 AC_SUBST([DEP_FLAGS])
 AC_SUBST([DEP_PROCESS])])
 

diff --git a/configure.ac b/configure.ac
index 5e340d7abbd49c0d3d25ae9289427b54ec1d167e..09f719a00e6c05e05b79093427dd18ac8fd567a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -163,19 +163,6 @@ GMP_PROG_EXEEXT_FOR_BUILD
 
 LSH_DEPENDENCY_TRACKING
 
-if test x$enable_dependency_tracking = xyes ; then
-  # Since the makefiles use include to get the dependency files, we must
-  # make sure that the files exist. We generate some more files than are
-  # actually needed.
-
-  AC_CONFIG_COMMANDS([dummy-dep-files],
-  [(cd "$srcdir" && find . '(' -name '*.c' -o -name '*.cxx' ')' -print) \
- | sed 's/\.cx*$//' | (while read f; do \
-      test -f "$f.o.d" || echo > "$f.o.d"; \
-   done)
-])
-fi
-
 if test "x$enable_gcov" = "xyes"; then
   CFLAGS="$CFLAGS -ftest-coverage -fprofile-arcs"
 fi

diff --git a/examples/Makefile.in b/examples/Makefile.in
index edf2e68f8167645e05ac8951c3e03e4139c77771..7075e889763d403711ed9423a961b01f77737be3 100644 (file)
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -131,7 +131,7 @@ distdir: $(DISTFILES)
        cp $? $(distdir)
 
 clean:
-       -rm -f $(TARGETS) *.$(OBJEXT)
+       -rm -f $(TARGETS) *.$(OBJEXT) *.$(OBJEXT).d
 
 distclean: clean
        -rm -f Makefile *.d
@@ -139,4 +139,4 @@ distclean: clean
 tags:
        etags -o $(srcdir)/TAGS --include $(top_srcdir) $(srcdir)/*.c $(srcdir)/*.h
 
-@DEP_INCLUDE@ $(SOURCES:.c=.$(OBJEXT).d)
+-include $(SOURCES:.c=.$(OBJEXT).d)

diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 97128040912efe4a9232811e2c126d37c494cae5..adde619de211b0e8cbce5da1d6799710621c0aec 100644 (file)
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -156,7 +156,7 @@ distdir: $(DISTFILES)
 
 clean:
        -rm -f $(TARGETS) $(EXTRA_TARGETS) dlopen-test$(EXEEXT) \
-               *.o test.in test1.out test2.out
+               *.$(OBJEXT) *.$(OBJEXT).d test.in test1.out test2.out
 
 distclean: clean
        -rm -f Makefile *.d
@@ -167,4 +167,4 @@ tags:
 # Includes dependency files for everything, including objects which
 # the current configuration will not build.
 DEP_FILES = $(SOURCES:.c=.$(OBJEXT).d) $(CXX_SOURCES:.cxx=.$(OBJEXT).d)
-@DEP_INCLUDE@ $(DEP_FILES)
+-include $(DEP_FILES)

diff --git a/tools/Makefile.in b/tools/Makefile.in
index e1390f955b8551a0c54af44d2e82f1584c756e74..eb12a7f685e165a3dda004ccbe44f00f3a82eaf6 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -89,7 +89,7 @@ distdir: $(DISTFILES)
        cp $? $(distdir)
 
 clean:
-       -rm -f $(TARGETS) *.o
+       -rm -f $(TARGETS) *.$(OBJEXT) *.$(OBJEXT).d
 
 distclean: clean
        -rm -f Makefile *.d
@@ -97,4 +97,4 @@ distclean: clean
 tags:
        etags -o $(srcdir)/TAGS --include $(top_srcdir) $(srcdir)/*.c $(srcdir)/*.h
 
-@DEP_INCLUDE@ $(SOURCES:.c=.$(OBJEXT).d)
+-include $(SOURCES:.c=.$(OBJEXT).d)