summaryrefslogtreecommitdiff
path: root/lwlib
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-06-06 11:26:04 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-06-06 11:26:04 -0700
commit695e5b41ac15af4bcd635606db86995900617057 (patch)
tree09acda702b9a026bb00bb9e6f9dd7eb82f82f34e /lwlib
parent77984278b977d1ad4d8af78d79adb1563e0b4aa6 (diff)
downloademacs-695e5b41ac15af4bcd635606db86995900617057.tar.gz
* Makefile.in (ALL_CFLAGS): Add -I$(srcdir)/../lib.
This is needed because lisp.h includes intprops.h now.
Diffstat (limited to 'lwlib')
-rw-r--r--lwlib/ChangeLog5
-rw-r--r--lwlib/Makefile.in11
2 files changed, 11 insertions, 5 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index e98526f2546..f64d1cf36ec 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-06 Paul Eggert <eggert@cs.ucla.edu>
+
+ * Makefile.in (ALL_CFLAGS): Add -I$(srcdir)/../lib.
+ This is needed because lisp.h includes intprops.h now.
+
2011-04-16 Paul Eggert <eggert@cs.ucla.edu>
Static checks with GCC 4.6.0 and non-default toolkits.
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index baaa198d7b9..fe6bbc31282 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -1,18 +1,18 @@
# Copyright (C) 1992, 1993 Lucid, Inc.
# Copyright (C) 1994, 2001-2011 Free Software Foundation, Inc.
-#
+#
# This file is part of the Lucid Widget Library.
-#
+#
# The Lucid Widget Library is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 1, or (at your option)
# any later version.
-#
+#
# The Lucid Widget Library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR 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 GNU Emacs; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
@@ -55,7 +55,8 @@ OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o
ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
$(C_SWITCH_X_SYSTEM) $(C_SWITCH_MACHINE) \
$(C_WARNINGS_SWITCH) $(PROFILING_CFLAGS) $(CFLAGS) \
- -DHAVE_CONFIG_H -Demacs -I../src -I$(srcdir) -I$(srcdir)/../src
+ -DHAVE_CONFIG_H -Demacs -I../src \
+ -I$(srcdir) -I$(srcdir)/../src -I$(srcdir)/../lib
.c.o:
$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<