two patches for the Makefiles

two patches for the Makefiles

[Han Boetes]

Hi,

Here are two patches for the emacs Makefiles:

This patch aims to make sure the only file which is forgotten
after a make maintainer-clean is also removed.


--- orig/lisp/Makefile.in
+++ mod/lisp/Makefile.in
@@ -312,7 +312,7 @@
 	fi
 
 maintainer-clean:
-	cd $(lisp); rm -f *.elc */*.elc $(AUTOGENEL)
+	-rm -f ./Makefile; cd $(lisp); rm -f *.elc */*.elc $(AUTOGENEL)
 
 # Generate/update files for the bootstrap process.
 



This patch causes that make install doesn't relink emacs before
installing emacs.


--- orig/src/Makefile.in
+++ mod/src/Makefile.in
@@ -969,10 +969,8 @@
    to both ensure that lwlib gets remade based on its dependencies
    in its own makefile,
    and remake temacs if lwlib gets changed by this.  */
-stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU)
+stamp-oldxmenu: ${OLDXMENU}
 	touch stamp-oldxmenu
-/* Supply an ordering for parallel make.  */
-../src/$(OLDXMENU): ${OLDXMENU}
 
 #ifdef USE_X_TOOLKIT
 $(OLDXMENU): really-lwlib




# Han

Re: two patches for the Makefiles

[Jan D.]

Han Boetes wrote:
> Hi,
> 
> Here are two patches for the emacs Makefiles:
> 
> This patch aims to make sure the only file which is forgotten
> after a make maintainer-clean is also removed.

I've made maintainer-clean depend on distclean so the Makefile is removed.

> This patch causes that make install doesn't relink emacs before
> installing emacs.
> 

Does this happen on any other Emacs variant than GTK for you?  I've added a 
different fix for GTK.

	Jan D.

Re: two patches for the Makefiles

[Han Boetes]

Jan D. wrote:
> Han Boetes wrote:
> > This patch causes that make install doesn't relink emacs
> > before installing emacs.
>
> Does this happen on any other Emacs variant than GTK for you?
> I've added a different fix for GTK.

Ehm this happens on GNU as well as on OpenBSD, with or without X.

Reproduction is easy: after a succesfull make run make install and
you'll see that emacs is linked again.

Lots of files are installed for a second time like the DOC file
and emacs-21.3.50.x and emacs-21.3.50.x+1



# Han

Re: two patches for the Makefiles

[Jan D.]

Han Boetes wrote:
> Jan D. wrote:
> 
>>Han Boetes wrote:
>>
>>>This patch causes that make install doesn't relink emacs
>>>before installing emacs.
>>
>>Does this happen on any other Emacs variant than GTK for you?
>>I've added a different fix for GTK.
> 
> 
> Ehm this happens on GNU as well as on OpenBSD, with or without X.
> 
> Reproduction is easy: after a succesfull make run make install and
> you'll see that emacs is linked again.
> 
> Lots of files are installed for a second time like the DOC file
> and emacs-21.3.50.x and emacs-21.3.50.x+1

Sorry, this just doesn't happen for me with a current CVS.  I tried Lucid, GTK, 
no toolit, and no X.  Nothing gets relinked or regenerated on a make install 
after a successful make.

If you have GNU make you could check why make thinks it needs to relink Emacs 
with 'make --debug=b'.

	Jan D.

Re: two patches for the Makefiles

[Han Boetes]

Jan D. wrote:
> Han Boetes wrote:
> > Jan D. wrote:
> > > Han Boetes wrote:
> > > > This patch causes that make install doesn't relink emacs
> > > > before installing emacs.
> > >
> > > Does this happen on any other Emacs variant than GTK for
> > > you? I've added a different fix for GTK.
> >
> > Ehm this happens on GNU as well as on OpenBSD, with or
> > without X.
> >
> > Reproduction is easy: after a succesfull make run make install
> > and you'll see that emacs is linked again.
> >
> > Lots of files are installed for a second time like the DOC
> > file and emacs-21.3.50.x and emacs-21.3.50.x+1
>
> Sorry, this just doesn't happen for me with a current CVS. I
> tried Lucid, GTK, no toolit, and no X. Nothing gets relinked or
> regenerated on a make install after a successful make.
>
> If you have GNU make you could check why make thinks it needs to
> relink Emacs with 'make --debug=b'.

I just tried reproducing it with current emacs, and indeed, it
doesn't happen anymore. About 6 month ago I spend a few days
hunting this bug, and I came up with that fix.

This behaviour must have changed recently. Sorry for the noise.



# Han

Re: two patches for the Makefiles

[Jan D.]

> I just tried reproducing it with current emacs, and indeed, it
> doesn't happen anymore. About 6 month ago I spend a few days
> hunting this bug, and I came up with that fix.
>
> This behaviour must have changed recently. Sorry for the noise.

It actually did happen for GTK, so the noise was useful:-)

	Jan D.

Re: two patches for the Makefiles

[Han Boetes]

Jan D. wrote:
> Han wrote:
> > I just tried reproducing it with current emacs, and indeed, it
> > doesn't happen anymore. About 6 month ago I spend a few days
> > hunting this bug, and I came up with that fix.
> >
> > This behaviour must have changed recently. Sorry for the noise.
>
> It actually did happen for GTK, so the noise was useful:-)

Well actually, that's how I build emacs all that time. I recently
changed to building emacs without X support. OK, that explains a
lot. :-)



# Han