diff options
author | Glenn Morris <rgm@gnu.org> | 2011-02-08 19:25:07 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2011-02-08 19:25:07 -0800 |
commit | 7bd04bb46d2be419aa6dab9d35a5c42ad716d3d0 (patch) | |
tree | 784444211ec5288ebcc96cf006f64d5d322d9ce0 /lwlib | |
parent | caf825516ab00bd6d111b5a901f36a5c5839b6d7 (diff) | |
download | emacs-7bd04bb46d2be419aa6dab9d35a5c42ad716d3d0.tar.gz |
Update lucid toolkit build for src/globals.h being a generated file.
* lwlib/Makefile.in (@SET_MAKE@): New, set by configure.
(globals): New variable and rule.
(lwlib-utils.o, lwlib.o, lwlib-Xlw.o, lwlib-Xaw.o, lwlib-Xm.o)
(xlwmenu.o): Add dependency on src/globals.h.
Diffstat (limited to 'lwlib')
-rw-r--r-- | lwlib/ChangeLog | 7 | ||||
-rw-r--r-- | lwlib/Makefile.in | 19 |
2 files changed, 20 insertions, 6 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 450ede33a50..b3c0b45bd68 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,10 @@ +2011-02-09 Glenn Morris <rgm@gnu.org> + + * Makefile.in (@SET_MAKE@): New, set by configure. + (globals): New variable and rule. + (lwlib-utils.o, lwlib.o, lwlib-Xlw.o, lwlib-Xaw.o, lwlib-Xm.o) + (xlwmenu.o): Add dependency on src/globals.h. + 2011-01-31 Jan Djärv <jan.h.d@swipnet.se> * lwlib-Xm.c (make_destroyed_instance): diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index a89d60dc68b..68b465dff30 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -24,6 +24,7 @@ srcdir=@srcdir@ VPATH=@srcdir@ +@SET_MAKE@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@ C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ @@ -65,16 +66,22 @@ liblw.a: $(OBJS) $(AR) $@ $(OBJS) $(RANLIB) $@ +## lisp.h includes this. +globals = ../src/globals.h + +$(globals): + cd ../src; $(MAKE) $(MFLAGS) globals.h + # Depend on Makefile so that we recompile if TOOLKIT_DEFINES changes. lwlib.o: $(srcdir)/lwlib.c Makefile $(CC) -c $(CPPFLAGS) $(TOOLKIT_DEFINES) $(ALL_CFLAGS) $(srcdir)/lwlib.c -lwlib-utils.o: lwlib-utils.c lwlib-utils.h -lwlib.o: lwlib.c lwlib.h lwlib-int.h lwlib-Xaw.h lwlib-Xlw.h -lwlib-Xlw.o: lwlib-Xlw.c lwlib.h lwlib-int.h lwlib-Xlw.h -lwlib-Xaw.o: lwlib-Xaw.c lwlib-Xaw.h lwlib.h lwlib-int.h -lwlib-Xm.o: lwlib-Xm.c lwlib-Xm.h lwlib.h lwlib-int.h lwlib-utils.h -xlwmenu.o: xlwmenu.c xlwmenu.h lwlib.h xlwmenuP.h +lwlib-utils.o: $(globals) lwlib-utils.c lwlib-utils.h +lwlib.o: $(globals) lwlib.c lwlib.h lwlib-int.h lwlib-Xaw.h lwlib-Xlw.h +lwlib-Xlw.o: $(globals) lwlib-Xlw.c lwlib.h lwlib-int.h lwlib-Xlw.h +lwlib-Xaw.o: $(globals) lwlib-Xaw.c lwlib-Xaw.h lwlib.h lwlib-int.h +lwlib-Xm.o: $(globals) lwlib-Xm.c lwlib-Xm.h lwlib.h lwlib-int.h lwlib-utils.h +xlwmenu.o: $(globals) xlwmenu.c xlwmenu.h lwlib.h xlwmenuP.h mostlyclean: $(RM) *.o core liblw.a \#* |