[Emacs-diffs] /srv/bzr/emacs/trunk r103196: Update lucid toolkit build for src/globals.h being a generated file.

[Glenn Morris]

------------------------------------------------------------
revno: 103196
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-02-08 19:25:07 -0800
message:
  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.
modified:
  lwlib/ChangeLog
  lwlib/Makefile.in

=== modified file 'lwlib/ChangeLog'
--- a/lwlib/ChangeLog   2011-01-31 06:44:05 +0000
+++ b/lwlib/ChangeLog   2011-02-09 03:25:07 +0000
@@ -1,3 +1,10 @@
+2011-02-09  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * lwlib-Xm.c (make_destroyed_instance):

=== modified file 'lwlib/Makefile.in'
--- a/lwlib/Makefile.in 2011-01-25 04:08:28 +0000
+++ b/lwlib/Makefile.in 2011-02-09 03:25:07 +0000
@@ -24,6 +24,7 @@
 
 address@hidden@
 address@hidden@
address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
@@ -65,16 +66,22 @@
        $(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 \#*