From d87a9ab8930c5460b3ca510083679351c4178a7c Mon Sep 17 00:00:00 2001
From: Jan Djärv
Date: Tue, 9 Nov 2004 08:19:51 +0000
Subject: * doc.c: New variable Vbuild_files. (Fsnarf_documentation): If
 Vbuild_files is nil, populate it with file names from buildobh.lst.  Only
 attach docstrings from files that are in Vbuild_files. (syms_of_doc): Defvar
 Vbuild_files.

* Makefile.in (SOME_MACHINE_OBJECTS): Add fringe.o, image.o
and w32*.o.
(temacs${EXEEXT}): Generate buildobj.lst when temacs is linked.
(mostlyclean): rm buildobj.lst

* makefile.w32-in ($(TEMACS)): Generate buildobj.lst when temacs
is linked.
---
 src/Makefile.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
index 758e74ebf64..48952f674bb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -596,8 +596,10 @@ obj=    dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \
    These go in the DOC file on all machines
    in case they are needed there.  */
 SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \
-  xterm.o xfns.o xmenu.o xselect.o xrdb.o \
-  mac.o macterm.o macfns.o macmenu.o fontset.o
+  xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
+  mac.o macterm.o macfns.o macmenu.o fontset.o \
+  w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \
+  w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o
 
 
 #ifdef TERMINFO
@@ -944,6 +946,7 @@ ${libsrc}make-docfile${EXEEXT}:
 #endif
 
 temacs${EXEEXT}: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT}
+	echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst
 	$(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
     -o temacs ${STARTFILES} ${obj} ${otherobj}  \
     OBJECTS_MACHINE ${LIBES}
@@ -1272,6 +1275,7 @@ mostlyclean:
 	rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a
 	rm -f ../etc/DOC
 	rm -f bootstrap-emacs${EXEEXT}
+	rm -f buildobj.lst
 clean: mostlyclean
 	rm -f emacs-*${EXEEXT} emacs${EXEEXT}
 /**/# This is used in making a distribution.
-- 
cgit v1.2.1


From 16bf4e3264ebe086f5a86b16f3adb3e9fdf7dbce Mon Sep 17 00:00:00 2001
From: Jan Djärv
Date: Tue, 9 Nov 2004 10:59:49 +0000
Subject: * Makefile.in (stamp-oldxmenu): If HAVE_GTK, don't add dependencies
 to ${OLDXMENU}.

---
 src/Makefile.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Makefile.in')

diff --git a/src/Makefile.in b/src/Makefile.in
index 48952f674bb..3fd63fe5251 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -962,7 +962,7 @@ prefix-args${EXEEXT}: prefix-args.c $(config_h)
 #define OLDXMENU_OPTIONS
 #endif
 
-#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS)
+#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (HAVE_GTK)
 
 /* We use stamp-xmenu with these two deps
    to both ensure that lwlib gets remade based on its dependencies
@@ -1018,12 +1018,12 @@ really-oldXMenu:
 	@true  /* make -t should not create really-oldXMenu.  */
 .PHONY: really-oldXMenu
 #endif /* not USE_X_TOOLKIT */
-#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */
+#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */
 
 /* We don\'t really need this, but satisfy the dependency.  */
 stamp-oldxmenu:
 	touch stamp-oldxmenu
-#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */
+#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */
 
 ../config.status:: epaths.in
 	@echo "The file epaths.h needs to be set up from epaths.in."
-- 
cgit v1.2.1