carbon2-commit: Pay attention to the carbon files when working out dependencies.

changeset: 4382:0b395a2f70d75507a0fe50dd41c4f6a543a4fefe tag: tip user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Wed Jan 02 21:01:16 2008 +0100 files: src/ChangeLog.carbon2 src/depend src/make-src-depend description: Pay attention to the carbon files when working out dependencies. 2008-01-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; * make-src-depend (PrintPatternDeps): Pay attention to HAVE_CARBON as well as the other platform defines. Thank you for the bug report, Jamie Zawinski. * depend: Regenerate with the new make-src-depend. diff -r 96b46beb14173fd3c40e4c1e943c124315bb00a7 -r 0b395a2f70d75507a0fe50dd41c4f6a543a4fefe src/ChangeLog.carbon2 --- a/src/ChangeLog.carbon2 Sun Dec 30 16:29:16 2007 +0100 +++ b/src/ChangeLog.carbon2 Wed Jan 02 21:01:16 2008 +0100 ＠＠ -1,3 +1,10 ＠＠ 2007-12-26 Aidan Kehoe <kehoea＠parhasa +2008-01-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * make-src-depend (PrintPatternDeps): Pay attention to HAVE_CARBON + as well as the other platform defines. Thank you for the bug + report, Jamie Zawinski. + * depend: Regenerate with the new make-src-depend. + 2007-12-26 Aidan Kehoe <kehoea(a)parhasard.net&gt; * event-carbon.c (get_process_events): Removed. diff -r 96b46beb14173fd3c40e4c1e943c124315bb00a7 -r 0b395a2f70d75507a0fe50dd41c4f6a543a4fefe src/depend --- a/src/depend Sun Dec 30 16:29:16 2007 +0100 +++ b/src/depend Wed Jan 02 21:01:16 2008 +0100 ＠＠ -89,7 +89,7 ＠＠ ui-gtk.o: $(LISP_H) buffer.h bufslots.h ui-gtk.o: $(LISP_H) buffer.h bufslots.h bytecode.h casetab.h charset.h chartab.h conslots.h console-gtk-impl.h console-gtk.h console-impl.h console.h device.h elhash.h emacs-marshals.c emacs-widget-accessors.c event-gtk.h events.h faces.h glade.c glyphs-gtk.h glyphs.h gtk-glue.c gui.h hash.h objects-gtk-impl.h objects-gtk.h objects-impl.h objects.h redisplay.h scrollbar.h specifier.h sysdll.h systime.h ui-byhand.c ui-gtk.h window-impl.h window.h winslots.h #endif #if defined(HAVE_DATABASE) -database.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h database.h sysfile.h +database.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h database.h file-coding.h sysfile.h #endif #if defined(MULE) mule-ccl.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h elhash.h file-coding.h mule-ccl.h ＠＠ -102,7 +102,21 ＠＠ ExternalClient.o: $(CONFIG_H) ExternalCl ExternalClient.o: $(CONFIG_H) ExternalClient.h ExternalClientP.h compiler.h extw-Xlib.h extw-Xt.h xintrinsicp.h ExternalShell.o: $(CONFIG_H) ExternalShell.h ExternalShellP.h compiler.h extw-Xlib.h extw-Xt.h xintrinsic.h xintrinsicp.h extw-Xlib.o: $(CONFIG_H) extw-Xlib.h -extw-Xt.o: $(CONFIG_H) extw-Xlib.h extw-Xt.h +extw-Xt.o: $(CONFIG_H) compiler.h extw-Xlib.h extw-Xt.h +#endif +#if defined(HAVE_CARBON) +console-carbon.o: $(LISP_H) conslots.h console-impl.h console.h elhash.h specifier.h +device-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h redisplay.h specifier.h sysdep.h +event-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h dragdrop.h events.h frame-impl.h frame.h frameslots.h process.h redisplay.h specifier.h sysproc.h syssignal.h systime.h +frame-carbon.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h commands.h conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h events.h faces.h frame-impl.h frame.h frameslots.h gutter.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h scrollbar.h specifier.h systime.h window-impl.h window.h winslots.h +glyphs-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h glyphs-carbon.h glyphs.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h scrollbar.h specifier.h sysfile.h window-impl.h window.h winslots.h +intl-carbon.o: $(LISP_H) +menubar-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h events.h frame-impl.h frame.h frameslots.h gui.h menubar.h redisplay.h scrollbar.h specifier.h systime.h window-impl.h window.h winslots.h +objects-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h specifier.h +redisplay-carbon.o: $(LISP_H) charset.h conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h faces.h frame-impl.h frame.h frameslots.h glyphs-carbon.h glyphs.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h scrollbar.h specifier.h window-impl.h window.h winslots.h +scrollbar-carbon.o: $(LISP_H) charset.h conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h faces.h frame-impl.h frame.h frameslots.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h scrollbar.h specifier.h window-impl.h window.h winslots.h +select-carbon.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h commands.h conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h dragdrop.h frame-impl.h frame.h frameslots.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h select.h specifier.h +toolbar-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h glyphs-carbon.h glyphs.h gui.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h scrollbar.h specifier.h toolbar.h window-impl.h window.h winslots.h #endif abbrev.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h commands.h insdel.h redisplay.h scrollbar.h syntax.h window.h alloc.o: $(LISP_H) backtrace.h buffer.h bufslots.h bytecode.h casetab.h charset.h chartab.h coding-system-slots.h conslots.h console-impl.h console-stream.h console.h device.h elhash.h events.h extents-impl.h extents.h file-coding.h frame-impl.h frame.h frameslots.h glyphs.h lstream.h opaque.h process.h profile.h redisplay.h scrollbar.h specifier.h sysdep.h sysfile.h systime.h window-impl.h window.h winslots.h ＠＠ -177,7 +191,6 ＠＠ input-method-xlib.o: $(LISP_H) $(LWLIB_S input-method-xlib.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h EmacsFrame.h buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console-x-impl.h console-x.h console.h device-impl.h device.h devslots.h events.h frame-impl.h frame.h frameslots.h redisplay.h scrollbar.h specifier.h systime.h window-impl.h window.h winslots.h xintrinsic.h insdel.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h console.h device.h extents.h frame.h insdel.h line-number.h lstream.h redisplay.h intl-auto-encap-win32.o: $(LISP_H) intl-auto-encap-win32.h syswindows.h -intl-carbon.o: $(LISP_H) intl-encap-win32.o: $(LISP_H) console-msw.h console.h intl-auto-encap-win32.h syswindows.h intl-win32.o: $(LISP_H) charset.h coding-system-slots.h conslots.h console-impl.h console-msw-impl.h console-msw.h console.h elhash.h faces.h file-coding.h frame-impl.h frame.h frameslots.h intl-auto-encap-win32.h objects-impl.h objects-msw-impl.h objects-msw.h objects.h redisplay.h scrollbar.h specifier.h syswindows.h window-impl.h window.h winslots.h intl.o: $(LISP_H) ＠＠ -194,7 +207,6 ＠＠ marker.o: $(LISP_H) buffer.h bufslots.h marker.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h mc-alloc.o: $(LISP_H) blocktype.h getpagesize.h md5.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h file-coding.h lstream.h -menubar-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h events.h frame-impl.h frame.h frameslots.h gui.h menubar.h redisplay.h scrollbar.h systime.h window-impl.h window.h winslots.h menubar.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h gui.h keymap.h menubar.h redisplay.h scrollbar.h specifier.h window-impl.h window.h winslots.h minibuf.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h commands.h conslots.h console-impl.h console-stream.h console.h events.h frame-impl.h frame.h frameslots.h insdel.h redisplay.h scrollbar.h specifier.h systime.h window-impl.h window.h winslots.h miscplay.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h miscplay.h sound.h sysfile.h syssignal.h ＠＠ -205,7 +217,6 ＠＠ number-gmp.o: $(LISP_H) sysproc.h syssig number-gmp.o: $(LISP_H) sysproc.h syssignal.h systime.h number-mp.o: $(LISP_H) number.o: $(LISP_H) -objects-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h specifier.h objects.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console-tty.h console.h device-impl.h device.h devslots.h elhash.h faces.h frame.h glyphs.h objects-impl.h objects.h redisplay.h scrollbar.h specifier.h systty.h window-impl.h window.h winslots.h offix.o: offix-cursors.h offix-types.h offix.h xintrinsic.h opaque.o: $(LISP_H) opaque.h ＠＠ -242,7 +253,6 ＠＠ terminfo.o: $(CONFIG_H) terminfo.o: $(CONFIG_H) tests.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h elhash.h file-coding.h lstream.h opaque.h text.o: $(LISP_H) backtrace.h buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h file-coding.h lstream.h profile.h -toolbar-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h glyphs-carbon.h glyphs.h gui.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h scrollbar.h specifier.h toolbar.h window-impl.h window.h winslots.h toolbar-common.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h charset.h conslots.h console-gtk-impl.h console-gtk.h console-impl.h console-x-impl.h console-x.h console.h device-impl.h device.h devslots.h faces.h frame-impl.h frame.h frameslots.h glyphs.h redisplay.h scrollbar.h specifier.h toolbar-common.h toolbar.h window-impl.h window.h winslots.h xintrinsic.h toolbar.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h glyphs.h redisplay.h scrollbar.h specifier.h toolbar.h window-impl.h window.h winslots.h tooltalk.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h elhash.h process.h syssignal.h tooltalk.h diff -r 96b46beb14173fd3c40e4c1e943c124315bb00a7 -r 0b395a2f70d75507a0fe50dd41c4f6a543a4fefe src/make-src-depend --- a/src/make-src-depend Sun Dec 30 16:29:16 2007 +0100 +++ b/src/make-src-depend Wed Jan 02 21:01:16 2008 +0100 ＠＠ -150,6 +150,7 ＠＠ PrintPatternDeps ('^database', "HAVE_DAT PrintPatternDeps ('^database', "HAVE_DATABASE"); PrintPatternDeps ('^mule', "MULE"); PrintPatternDeps ('^(?:External|extw-)', "EXTERNAL_WIDGET"); +PrintPatternDeps ('-carbon\\.', "HAVE_CARBON"); for my $file (sort grep (/\.c$/, keys %uses)) { PrintDeps($file); } _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches