view 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
line wrap: on
line source

##   Common Makefile section for modules in XEmacs.
##   Copyright (C) 2002 Jerry James.
##   Copyright (C) 2005 Ben Wing.

## This file is part of XEmacs.

## XEmacs 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 2, or (at your option) any
## later version.

## XEmacs 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 XEmacs; see the file COPYING.  If not, write to
## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
## Boston, MA 02111-1307, USA.

## Synched up with: Not in FSF.

## This is more complicated than would normally be the case, as this makefile
## has been tailored to work both inside and independently of the XEmacs
## source tree, and to support both module and non-module building inside the
## source tree.

## Note: This will be appended to the individual module Makefiles by configure.

#define NOT_C_CODE
#include "../../src/config.h"

SHELL=/bin/sh
RM=rm -f
PROGNAME=@PROGNAME@
CFLAGS=@XE_CFLAGS@
INSTALL=@INSTALL@
version=@version@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
instvardir=@instvardir@
configuration=@configuration@
moduledir=@moduledir@
with_modules=@with_modules@

srcdir=@srcdir@
VPATH=@srcdir@

SRC_SRCS=$(SRCS:%=@srcdir@/%)
OBJS=$(SRCS:.c=.o)

MODCC=@MOD_CC@
MODARCHDIR=@MODARCHDIR@
MAKE_DOCFILE=@MAKE_DOCFILE@
MODCFLAGS=@MODCFLAGS@
INSTALLPATH=@INSTALLPATH@
INSTALL_PROGRAM=@MOD_INSTALL_PROGRAM@
OBJECT_TO_BUILD=@OBJECT_TO_BUILD@
LIBSTDCPP=@LIBSTDCPP@
#ifdef WIN32_ANY
IMPORT_LIB=../../src/xemacs-import.a
#endif

.PHONY:	install
all: $(OBJECT_TO_BUILD)

.c.o:
	$(MODCC) $(MODCFLAGS) -c $<

$(MODNAME).ell: $(OBJS) $(MODNAME)_i.o $(IMPORT_LIB)
	$(MODCC) --mode=link --mode=verbose --mod-output=$@ \
	$(OBJS) $(MODNAME)_i.o $(IMPORT_LIB) $(LDFLAGS) $(LIBSTDCPP)

$(MODNAME)_i.c: $(SRCS)
	ELLMAKEDOC=$(MAKE_DOCFILE) $(MODCC) --mode=init --mod-output=$@ \
	--mod-name=$(MODNAME) --mod-version=$(MODVER) \
	--mod-title=$(MODTITLE) $(SRC_SRCS)

.PHONY: mostlyclean clean distclean realclean extraclean
.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
mostlyclean:
	-$(RM) $(OBJS) $(MODNAME)_i.* core
clean: mostlyclean
	-$(RM) $(MODNAME).ell
distclean-noconfig: clean
	-$(RM) config.* TAGS
## This is used in making a distribution.
## Do not use it on development directories!
distclean: distclean-noconfig
	-$(RM) GNUmakefile Makefile Makefile.in configure
realclean-noconfig: distclean-noconfig
realclean: distclean
extraclean-noconfig: realclean-noconfig
	-$(RM) *~ \#*
extraclean: realclean
	-$(RM) *~ \#*

install: $(OBJECT_TO_BUILD)
	$(INSTALL_PROGRAM) $< $(INSTALLPATH)

##
## Local Variables:
## mode: makefile
## End:
##