diff options
Diffstat (limited to 'oldXMenu')
| -rw-r--r-- | oldXMenu/ChangeLog | 53 | ||||
| -rw-r--r-- | oldXMenu/Makefile.in | 72 | ||||
| -rw-r--r-- | oldXMenu/XMenuInt.h | 1 | ||||
| -rw-r--r-- | oldXMenu/autodeps.mk | 5 | ||||
| -rw-r--r-- | oldXMenu/deps.mk | 72 |
5 files changed, 156 insertions, 47 deletions
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index e66253a1e74..cb873f6c4eb 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,6 +1,45 @@ 2014-10-20 Glenn Morris <rgm@gnu.org> - * Version 24.4 released. + * Merge in all changes up to 24.4 release. + +2014-09-04 Paul Eggert <eggert@cs.ucla.edu> + + Less chatter in 'make' output. + * Makefile.in (clean mostlyclean): Simplify, for shorter command line. + +2014-09-01 Paul Eggert <eggert@cs.ucla.edu> + + --enable-silent-rules now suppresses more chatter. + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) + (am__v_CC_0, am__v_CC_1): New macros, taken from Automake. + (.c.o): Use them. + +2014-07-12 Dmitry Antipov <dmantipov@yandex.ru> + + * XMenuInt.h (XDeleteAssoc): Remove duplicated prototype to + pacify -Wredundant-decls. + +2014-06-28 Glenn Morris <rgm@gnu.org> + + * deps.mk (${OBJS}): Depend on ../src/config.h. + + * Makefile.in: Use gcc auto-dependency information. + Move old dependency information to new file deps.mk. + (MKDIR_P, DEPFLAGS, MKDEPDIR, oldxmenu_deps_frag): + New, set by configure. + (DEPDIR): New variable. + (ALL_CFLAGS): Add DEPFLAGS. + (.c.o): Add MKDEPDIR. + (clean, mostlyclean): Delete DEPDIR. + * deps.mk, autodeps.mk: New files. + +2014-06-15 Glenn Morris <rgm@gnu.org> + + * Makefile.in (CPPFLAGS): Explicitly set via configure. + + * Makefile.in (mostlyclean, clean, distclean, maintainer-clean, tags): + Declare as PHONY. + (boostrap-clean): New. 2013-10-24 Glenn Morris <rgm@gnu.org> @@ -59,8 +98,8 @@ (MAX_INACT_PNUM, TILE_BUF_SIZE): Remove; unused. (x_get_resource_string): Args are readonly. (XAllocDisplayColor): colorName is readonly. - (XMenuCreate): def_env is readonly. Remove unused locals. Avoid - "else;". + (XMenuCreate): def_env is readonly. Remove unused locals. + Avoid "else;". * Destroy.c (XMenuDestroy): Return void. * Error.c (XMenuError): Remove const pointer. * EvHand.c (XMenuEventHandler): Return void. @@ -315,7 +354,7 @@ 1995-02-07 Richard Stallman <rms@pogo.gnu.ai.mit.edu> - * Makefile.in (maintainer-clean): Renamed from realclean. + * Makefile.in (maintainer-clean): Rename from realclean. 1994-10-25 Richard Stallman <rms@mole.gnu.ai.mit.edu> @@ -395,8 +434,8 @@ 1993-09-27 Brian J. Fox (bfox@valhalla) - * Makefile.in (CPP, LN_S, C_SWITCH_X_SITE, CC, CFLAGS): Allow - `configure' to supply the values for these variables. + * Makefile.in (CPP, LN_S, C_SWITCH_X_SITE, CC, CFLAGS): + Allow `configure' to supply the values for these variables. 1993-09-26 Brian J. Fox (bfox@ai.mit.edu) @@ -601,7 +640,7 @@ * XDelAssoc.c, XLookAssoc.c, XCrAssoc.c, XDestAssoc.c, XMakeAssoc.c: Use Xlib.h, not Xlibint.h. - * XLookAssoc.c, XMakeAssoc.c, XCrAssoc.c (NULL): Defined. + * XLookAssoc.c, XMakeAssoc.c, XCrAssoc.c (NULL): Define. * XMakeAssoc.c, XCrAssoc.c: Include errno.h. Declare errno. * XMakeAssoc.c (_XIOErrorFunction): Declared. diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index c1fdd8244ed..3e1d49d2ea3 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -56,11 +56,14 @@ WERROR_CFLAGS = @WERROR_CFLAGS@ EXTRA=insque.o CC=@CC@ CFLAGS=@CFLAGS@ +CPPFLAGS = @CPPFLAGS@ + TAGS = etags RM = rm -f RANLIB = @RANLIB@ AR = @AR@ ARFLAGS = @ARFLAGS@ +MKDIR_P = @MKDIR_P@ OBJS = Activate.o \ AddPane.o \ @@ -90,58 +93,49 @@ OBJS = Activate.o \ all: libXMenu11.a .PHONY: all +# 'make' verbosity. +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = + +DEPDIR = deps +## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. +DEPFLAGS = @DEPFLAGS@ +## ${MKDIR_P} ${DEPDIR} (if AUTO_DEPEND); else ':'. +MKDEPDIR = @MKDEPDIR@ + ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ - $(C_SWITCH_X_SITE) \ + $(C_SWITCH_X_SITE) $(DEPFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) ${PROFILING_CFLAGS} \ $(CPPFLAGS) $(CFLAGS) -DEMACS_BITMAP_FILES \ -I../src -I../lib -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib .c.o: - $(CC) -c ${ALL_CFLAGS} $< + @$(MKDEPDIR) + $(AM_V_CC)$(CC) -c ${ALL_CFLAGS} $< libXMenu11.a: $(OBJS) $(EXTRA) $(RM) $@ $(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA) $(RANLIB) $@ -Activate.o: Activate.c XMenuInt.h XMenu.h X10.h -AddPane.o: AddPane.c XMenuInt.h XMenu.h X10.h -AddSel.o: AddSel.c XMenuInt.h XMenu.h X10.h -ChgPane.o: ChgPane.c XMenuInt.h XMenu.h X10.h -ChgSel.o: ChgSel.c XMenuInt.h XMenu.h X10.h -Create.o: Create.c XMenuInt.h XMenu.h X10.h -DelPane.o: DelPane.c XMenuInt.h XMenu.h X10.h -DelSel.o: DelSel.c XMenuInt.h XMenu.h X10.h -Destroy.o: Destroy.c XMenuInt.h XMenu.h X10.h -Error.o: Error.c XMenuInt.h XMenu.h X10.h -EvHand.o: EvHand.c XMenuInt.h XMenu.h X10.h -FindPane.o: FindPane.c XMenuInt.h XMenu.h X10.h -FindSel.o: FindSel.c XMenuInt.h XMenu.h X10.h -InsPane.o: InsPane.c XMenuInt.h XMenu.h X10.h -InsSel.o: InsSel.c XMenuInt.h XMenu.h X10.h -Internal.o: Internal.c XMenuInt.h XMenu.h X10.h -Locate.o: Locate.c XMenuInt.h XMenu.h X10.h -Post.o: Post.c XMenuInt.h XMenu.h X10.h -Recomp.o: Recomp.c XMenuInt.h XMenu.h X10.h -SetAEQ.o: SetAEQ.c XMenuInt.h XMenu.h X10.h -SetFrz.o: SetFrz.c XMenuInt.h XMenu.h X10.h -SetPane.o: SetPane.c XMenuInt.h XMenu.h X10.h -SetSel.o: SetSel.c XMenuInt.h XMenu.h X10.h -XDelAssoc.o: XDelAssoc.c X10.h -XLookAssoc.o: XLookAssoc.c X10.h -XCrAssoc.o: XCrAssoc.c X10.h -XDestAssoc.o: XDestAssoc.c X10.h -XMakeAssoc.o: XMakeAssoc.c X10.h -insque.o: insque.c - -FRC.mostlyclean: -mostlyclean: FRC.mostlyclean - rm -f libXMenu11.a ${OBJS} ${EXTRA} -clean: mostlyclean -distclean: clean +## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk. +@oldxmenu_deps_frag@ + +.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean + +clean mostlyclean: + rm -f libXMenu11.a *.o + -rm -rf ${DEPDIR} + +bootstrap-clean maintainer-clean distclean: clean rm -f Makefile -maintainer-clean: distclean +.PHONY: tags tags: $(TAGS) -t *.[ch] -.PHONY: tags + +### Makefile.in ends here diff --git a/oldXMenu/XMenuInt.h b/oldXMenu/XMenuInt.h index 1edef30bc5f..369b8c1a4a9 100644 --- a/oldXMenu/XMenuInt.h +++ b/oldXMenu/XMenuInt.h @@ -62,7 +62,6 @@ void _XMRefreshPane(Display *display, XMenu *menu, XMPane *pane); void _XMRefreshSelection(Display *display, XMenu *menu, XMSelect *select); void emacs_insque (void *elem, void *prev); void emacs_remque (void *elem); -void XDeleteAssoc(Display *dpy, XAssocTable *table, XID x_id); void XDestroyAssocTable(XAssocTable *table); void XMakeAssoc(Display *dpy, XAssocTable *table, XID x_id, void *data); void XDeleteAssoc(Display *dpy, XAssocTable *table, XID x_id); diff --git a/oldXMenu/autodeps.mk b/oldXMenu/autodeps.mk new file mode 100644 index 00000000000..f7109295ce2 --- /dev/null +++ b/oldXMenu/autodeps.mk @@ -0,0 +1,5 @@ +### autodeps.mk --- lwlib/Makefile fragment for GNU Emacs + +## This is inserted in lwlib/Makefile if AUTO_DEPEND=yes. + +-include $(ALLOBJS:%.o=${DEPDIR}/%.d) diff --git a/oldXMenu/deps.mk b/oldXMenu/deps.mk new file mode 100644 index 00000000000..81088c51b1e --- /dev/null +++ b/oldXMenu/deps.mk @@ -0,0 +1,72 @@ +### deps.mk --- oldXMenu/Makefile fragment for GNU Emacs + +## Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology + +## Permission to use, copy, modify, and distribute this +## software and its documentation for any purpose and without +## fee is hereby granted, provided that the above copyright +## notice appear in all copies and that both that copyright +## notice and this permission notice appear in supporting +## documentation, and that the name of M.I.T. not be used in +## advertising or publicity pertaining to distribution of the +## software without specific, written prior permission. +## M.I.T. makes no representations about the suitability of +## this software for any purpose. It is provided "as is" +## without express or implied warranty. + + +## Copyright (C) 2001-2014 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 +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program. If not, see <http://www.gnu.org/licenses/>. + +### Commentary: + +## This file is inserted in oldXMenu/Makefile if AUTO_DEPEND=no. +## It defines static dependencies between the various source files. + +### Code: + +Activate.o: Activate.c XMenuInt.h XMenu.h X10.h +AddPane.o: AddPane.c XMenuInt.h XMenu.h X10.h +AddSel.o: AddSel.c XMenuInt.h XMenu.h X10.h +ChgPane.o: ChgPane.c XMenuInt.h XMenu.h X10.h +ChgSel.o: ChgSel.c XMenuInt.h XMenu.h X10.h +Create.o: Create.c XMenuInt.h XMenu.h X10.h +DelPane.o: DelPane.c XMenuInt.h XMenu.h X10.h +DelSel.o: DelSel.c XMenuInt.h XMenu.h X10.h +Destroy.o: Destroy.c XMenuInt.h XMenu.h X10.h +Error.o: Error.c XMenuInt.h XMenu.h X10.h +EvHand.o: EvHand.c XMenuInt.h XMenu.h X10.h +FindPane.o: FindPane.c XMenuInt.h XMenu.h X10.h +FindSel.o: FindSel.c XMenuInt.h XMenu.h X10.h +InsPane.o: InsPane.c XMenuInt.h XMenu.h X10.h +InsSel.o: InsSel.c XMenuInt.h XMenu.h X10.h +Internal.o: Internal.c XMenuInt.h XMenu.h X10.h +Locate.o: Locate.c XMenuInt.h XMenu.h X10.h +Post.o: Post.c XMenuInt.h XMenu.h X10.h +Recomp.o: Recomp.c XMenuInt.h XMenu.h X10.h +SetAEQ.o: SetAEQ.c XMenuInt.h XMenu.h X10.h +SetFrz.o: SetFrz.c XMenuInt.h XMenu.h X10.h +SetPane.o: SetPane.c XMenuInt.h XMenu.h X10.h +SetSel.o: SetSel.c XMenuInt.h XMenu.h X10.h +XDelAssoc.o: XDelAssoc.c X10.h +XLookAssoc.o: XLookAssoc.c X10.h +XCrAssoc.o: XCrAssoc.c X10.h +XDestAssoc.o: XDestAssoc.c X10.h +XMakeAssoc.o: XMakeAssoc.c X10.h +insque.o: insque.c + +${OBJS}: ../src/config.h + +### deps.mk ends here |