Mercurial > hg > xemacs-beta
annotate modules/common/Makefile.common @ 5047:07dcc7000bbf
put width before height consistently, fix a real bug found in the process
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-20 Ben Wing <ben@xemacs.org>
* EmacsFrame.c (EmacsFrameRecomputeCellSize):
* faces.c (default_face_font_info):
* faces.c (default_face_width_and_height):
* faces.c (Fface_list):
* faces.h:
* frame-gtk.c (gtk_set_initial_frame_size):
* frame-gtk.c (gtk_set_frame_size):
* frame-gtk.c (gtk_recompute_cell_sizes):
* frame.c:
* frame.c (frame_conversion_internal_1):
* frame.c (change_frame_size_1):
* frame.c (change_frame_size):
* glyphs-msw.c (mswindows_combo_box_instantiate):
* glyphs-widget.c (widget_instantiate):
* glyphs-widget.c (tree_view_query_geometry):
* glyphs-widget.c (Fwidget_logical_to_character_width):
* glyphs-widget.c (Fwidget_logical_to_character_height):
* indent.c (vmotion_pixels):
* redisplay-output.c (get_cursor_size_and_location):
* redisplay-xlike-inc.c (XLIKE_output_eol_cursor):
* redisplay-xlike-inc.c (XLIKE_flash):
* redisplay.c (calculate_baseline):
* redisplay.c (start_with_point_on_display_line):
* redisplay.c (glyph_to_pixel_translation):
* redisplay.c (pixel_to_glyph_translation):
* window.c (margin_width_internal):
* window.c (frame_size_valid_p):
* window.c (frame_pixsize_valid_p):
* window.c (check_frame_size):
* window.c (set_window_pixsize):
* window.c (window_pixel_height_to_char_height):
* window.c (window_char_height_to_pixel_height):
* window.c (window_displayed_height):
* window.c (window_pixel_width_to_char_width):
* window.c (window_char_width_to_pixel_width):
* window.c (change_window_height):
* window.c (window_scroll):
* window.h:
IMPORTANT: Aidan and Carbon Repo, please pay attention and fix
appropriately!
Rename: default_face_height_and_width -> default_face_width_and_height
and reverse width/height arguments.
Reverse width/height arguments to the following functions:
-- default_face_font_info
-- default_face_height_and_width (see above)
-- check_frame_size
-- frame_size_valid_p (made into a static function)
Fix a redisplay bug where args to default_face_height_and_width
were in the wrong order.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 20 Feb 2010 18:56:01 -0600 |
| parents | c356806cc933 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 1083 | 1 ## Common Makefile section for modules in XEmacs. |
| 2 ## Copyright (C) 2002 Jerry James. | |
| 3062 | 3 ## Copyright (C) 2005 Ben Wing. |
| 1083 | 4 |
| 5 ## This file is part of XEmacs. | |
| 6 | |
| 7 ## XEmacs is free software; you can redistribute it and/or modify it | |
| 8 ## under the terms of the GNU General Public License as published by the | |
| 9 ## Free Software Foundation; either version 2, or (at your option) any | |
| 10 ## later version. | |
| 11 | |
| 12 ## XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 ## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 ## for more details. | |
| 16 | |
| 17 ## You should have received a copy of the GNU General Public License | |
| 18 ## along with XEmacs; see the file COPYING. If not, write to | |
| 19 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 ## Boston, MA 02111-1307, USA. | |
| 21 | |
| 22 ## Synched up with: Not in FSF. | |
| 23 | |
| 24 ## This is more complicated than would normally be the case, as this makefile | |
| 25 ## has been tailored to work both inside and independently of the XEmacs | |
| 26 ## source tree, and to support both module and non-module building inside the | |
| 27 ## source tree. | |
| 28 | |
| 1111 | 29 ## Note: This will be appended to the individual module Makefiles by configure. |
| 30 | |
| 1632 | 31 #define NOT_C_CODE |
| 32 #include "../../src/config.h" | |
| 33 | |
| 1083 | 34 SHELL=/bin/sh |
| 35 RM=rm -f | |
| 36 PROGNAME=@PROGNAME@ | |
| 2377 | 37 CFLAGS=@XE_CFLAGS@ |
| 1083 | 38 INSTALL=@INSTALL@ |
| 39 version=@version@ | |
| 40 prefix=@prefix@ | |
| 41 exec_prefix=@exec_prefix@ | |
| 42 libdir=@libdir@ | |
| 43 instvardir=@instvardir@ | |
| 44 configuration=@configuration@ | |
| 45 moduledir=@moduledir@ | |
| 46 with_modules=@with_modules@ | |
| 47 | |
| 48 srcdir=@srcdir@ | |
| 49 VPATH=@srcdir@ | |
| 50 | |
| 1522 | 51 SRC_SRCS=$(SRCS:%=@srcdir@/%) |
| 1490 | 52 OBJS=$(SRCS:.c=.o) |
| 53 | |
| 1252 | 54 MODCC=@MOD_CC@ |
| 1083 | 55 MODARCHDIR=@MODARCHDIR@ |
| 56 MAKE_DOCFILE=@MAKE_DOCFILE@ | |
| 57 MODCFLAGS=@MODCFLAGS@ | |
| 58 INSTALLPATH=@INSTALLPATH@ | |
| 59 INSTALL_PROGRAM=@MOD_INSTALL_PROGRAM@ | |
| 60 OBJECT_TO_BUILD=@OBJECT_TO_BUILD@ | |
| 1650 | 61 LIBSTDCPP=@LIBSTDCPP@ |
|
4879
c356806cc933
fix compile errors when --with-msw=no
Ben Wing <ben@xemacs.org>
parents:
3083
diff
changeset
|
62 #ifdef WIN32_ANY |
| 1632 | 63 IMPORT_LIB=../../src/xemacs-import.a |
| 64 #endif | |
| 1083 | 65 |
| 3062 | 66 .PHONY: install |
| 1083 | 67 all: $(OBJECT_TO_BUILD) |
| 68 | |
| 69 .c.o: | |
| 1252 | 70 $(MODCC) $(MODCFLAGS) -c $< |
| 1083 | 71 |
| 1632 | 72 $(MODNAME).ell: $(OBJS) $(MODNAME)_i.o $(IMPORT_LIB) |
| 1489 | 73 $(MODCC) --mode=link --mode=verbose --mod-output=$@ \ |
| 1650 | 74 $(OBJS) $(MODNAME)_i.o $(IMPORT_LIB) $(LDFLAGS) $(LIBSTDCPP) |
| 1083 | 75 |
| 76 $(MODNAME)_i.c: $(SRCS) | |
| 1252 | 77 ELLMAKEDOC=$(MAKE_DOCFILE) $(MODCC) --mode=init --mod-output=$@ \ |
| 1083 | 78 --mod-name=$(MODNAME) --mod-version=$(MODVER) \ |
| 79 --mod-title=$(MODTITLE) $(SRC_SRCS) | |
| 80 | |
| 3062 | 81 .PHONY: mostlyclean clean distclean realclean extraclean |
| 82 .PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig | |
| 83 mostlyclean: | |
| 3083 | 84 -$(RM) $(OBJS) $(MODNAME)_i.* core |
| 3062 | 85 clean: mostlyclean |
| 3083 | 86 -$(RM) $(MODNAME).ell |
| 3062 | 87 distclean-noconfig: clean |
| 3083 | 88 -$(RM) config.* TAGS |
| 3062 | 89 ## This is used in making a distribution. |
| 90 ## Do not use it on development directories! | |
| 91 distclean: distclean-noconfig | |
| 3083 | 92 -$(RM) GNUmakefile Makefile Makefile.in configure |
| 3062 | 93 realclean-noconfig: distclean-noconfig |
| 94 realclean: distclean | |
| 95 extraclean-noconfig: realclean-noconfig | |
| 3083 | 96 -$(RM) *~ \#* |
| 3062 | 97 extraclean: realclean |
| 3083 | 98 -$(RM) *~ \#* |
| 1083 | 99 |
| 100 install: $(OBJECT_TO_BUILD) | |
| 101 $(INSTALL_PROGRAM) $< $(INSTALLPATH) | |
| 3062 | 102 |
| 103 ## | |
| 104 ## Local Variables: | |
| 105 ## mode: makefile | |
| 106 ## End: | |
| 107 ## |