From 8d86fdefeca78f13cf3f05912190a92e82ecba3d Mon Sep 17 00:00:00 2001
From: antona <antona>
Date: Thu, 4 Aug 2005 13:12:41 +0000
Subject: [PATCH] Fix make extra directly after ./configure.  Thanks to Yuval
 for the bug report.

---
 ChangeLog             | 4 ++++
 Makefile.am           | 9 ++++-----
 ntfsprogs/Makefile.am | 5 ++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 34c26718..380f3b4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,10 @@
 	  Anton)
 	- Add information about $EFS on-disk structures to layout.h.  (Yuval,
 	  Anton)
+	- Fix build so that make extra directly after ./configure works.
+	  Thanks to Yuval for the bug report.  (Anton)
+	- Add ./configure option --enable-crypto and if enabled detect whether
+	  libgcrypt is present or not.  (Anton)
 
 20/07/2005 - 1.11.1 - Fix several ntfsmount bugs.
 
diff --git a/Makefile.am b/Makefile.am
index 222799c3..01e776a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,11 +19,10 @@ libtool: $(LIBTOOL_DEPS)
 strip:
 	(cd ntfsprogs && $(MAKE) strip) || exit 1;
 
-extra:	extras
-
-extras:
-	(cd ntfsprogs && $(MAKE) extras) || exit 1;
-
 libs:
 	(cd libntfs && $(MAKE) libs) || exit 1;
 
+extra:	extras
+
+extras: libs
+	(cd ntfsprogs && $(MAKE) extras) || exit 1;
diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am
index 99f2bd2d..d2abe6b2 100644
--- a/ntfsprogs/Makefile.am
+++ b/ntfsprogs/Makefile.am
@@ -128,6 +128,9 @@ endif
 strip:	$(bin_PROGRAMS) $(sbin_PROGRAMS)
 	$(STRIP) $^
 
+libs:
+	(cd ../libntfs && $(MAKE) libs) || exit 1;
+
 extra:	extras
 
-extras:	$(EXTRA_PROGRAMS)
+extras:	libs $(EXTRA_PROGRAMS)