diff options
Diffstat (limited to 'oldXMenu')
| -rw-r--r-- | oldXMenu/ChangeLog | 31 | ||||
| -rw-r--r-- | oldXMenu/Makefile.in | 38 |
2 files changed, 43 insertions, 26 deletions
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index a7a1b84951..7c2b282637 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -2,6 +2,37 @@ * Version 23.2 released. +2010-05-06 Glenn Morris <[email protected]> + + * Makefile.in (RANLIB): Let configure set it. + (libXMenu11.a): Configure sets RANLIB = : on systems without it. + + * Makefile.in (CPP, LN_S, AS, LD, MV, LS, LINTOPTS, LINTLIBFLAG, MAKE) + (STD_DEFINES, CDEBUGFLAGS, RM_CMD): Remove unused variables. + +2010-05-04 Glenn Morris <[email protected]> + + * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): + Use @C_SWITCH_SYSTEM@, @C_SWITCH_MACHINE@ rather than + @c_switch_system@, @c_switch_machine@. + +2010-04-27 Dan Nicolaescu <[email protected]> + + * Makefile.in (C_SWITCH_X_SYSTEM): Define using autoconf. + +2010-04-23 Dan Nicolaescu <[email protected]> + + * Makefile.in (ALL_CFLAGS): Remove C_SWITCH_X_MACHINE, unused. + +2010-04-11 Dan Nicolaescu <[email protected]> + + * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE) + (C_SWITCH_X_SITE): Define using autoconf. + +2010-03-10 Chong Yidong <[email protected]> + + * Branch for 23.2. + 2009-06-21 Chong Yidong <[email protected]> * Branch for 23.1. diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index a4a2d52b15..5e2e2f6fb9 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -15,8 +15,8 @@ ## without express or implied warranty. -## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -## Free Software Foundation, Inc. +## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +## 2010 Free Software Foundation, Inc. ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ ## To the best of our knowledge, this code was originally based on the ## X11 oldXMenu Makefile, which was automatically generated from the -## X11 oldXMenu Imakefile. There was no explicit copyright information +## X11 oldXMenu Imakefile. There was no explicit copyright information ## in the Imakefile, therefore we have added the same MIT license as ## used by the rest of the oldXMenu code. @@ -46,28 +46,18 @@ srcdir=@srcdir@ VPATH=@srcdir@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ +C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@ +C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ +C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ EXTRA=insque.o CC=@CC@ CFLAGS=@CFLAGS@ -CPP=@CPP@ -LN_S=@LN_S@ - AS = as - LD = ld - TAGS = etags - RM = rm -f - MV = mv - RANLIB = ranlib +TAGS = etags +RM = rm -f +RANLIB = @RANLIB@ # Solaris 2.1 ar doesn't accept the 'l' option. - AR = ar cq - LS = ls - LINTOPTS = -axz - LINTLIBFLAG = -C - MAKE = make - STD_DEFINES = - CDEBUGFLAGS = -O - RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \ - tags TAGS make.log +AR = ar cq OBJS = Activate.o \ AddPane.o \ @@ -97,7 +87,7 @@ OBJS = Activate.o \ all:: libXMenu11.a ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ - $(C_SWITCH_X_SITE) $(C_SWITCH_X_SYSTEM) $(C_SWITCH_X_MACHINE) \ + $(C_SWITCH_X_SITE) $(C_SWITCH_X_SYSTEM) \ $(CPPFLAGS) $(CFLAGS) -DEMACS_BITMAP_FILES \ -I../src -I${srcdir} -I${srcdir}/../src @@ -107,11 +97,7 @@ ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ libXMenu11.a: $(OBJS) $(EXTRA) $(RM) $@ $(AR) $@ $(OBJS) $(EXTRA) - @echo Do not be alarmed if the following ranlib command - @echo fails due to the absence of a ranlib program on your system. - -$(RANLIB) $@ || true -#If running ranlib fails, probably there is none. -#That's ok. So don't stop the build. + $(RANLIB) $@ Activate.o: Activate.c XMenuInt.h XMenu.h X10.h AddPane.o: AddPane.c XMenuInt.h XMenu.h X10.h |