summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--guile.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8975547..b6eb261 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-05-18 Eli Zaretskii <eliz@gnu.org>
+
+ * guile.c: Move inclusion of makeint.h before gnumake.h. This
+ order must be observed when building Make, because gnumake.h must
+ be included with GMK_BUILDING_MAKE defined, which makeint.h
+ already does. Otherwise, the linker will look for, and fail to
+ find, gmk_* functions in some external dynamic library.
+
2013-05-17 Eli Zaretskii <eliz@gnu.org>
* main.c (prepare_mutex_handle_string): Define conditioned on
diff --git a/guile.c b/guile.c
index c1408a7..f5637fd 100644
--- a/guile.c
+++ b/guile.c
@@ -14,9 +14,9 @@ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
this program. If not, see <http://www.gnu.org/licenses/>. */
+#include "makeint.h"
#include "gnumake.h"
-#include "makeint.h"
#include "debug.h"
#include "dep.h"
#include "variable.h"