comparison src/Makefile.in.in @ 5495:1f0b15040456

Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 01 May 2011 18:44:03 +0100
parents 861f2601a38b 308d34e9f07d
children 4aa8ee813265
comparison
equal deleted inserted replaced
5494:861f2601a38b 5495:1f0b15040456
5 ## Copyright (C) 1998, 1999 J. Kean Johnston. 5 ## Copyright (C) 1998, 1999 J. Kean Johnston.
6 ## Copyright (C) 2001, 2002, 2003, 2005, 2010 Ben Wing. 6 ## Copyright (C) 2001, 2002, 2003, 2005, 2010 Ben Wing.
7 7
8 ## This file is part of XEmacs. 8 ## This file is part of XEmacs.
9 9
10 ## XEmacs is free software; you can redistribute it and/or modify it 10 ## XEmacs is free software: you can redistribute it and/or modify it
11 ## under the terms of the GNU General Public License as published by the 11 ## under the terms of the GNU General Public License as published by the
12 ## Free Software Foundation; either version 2, or (at your option) any 12 ## Free Software Foundation, either version 3 of the License, or (at your
13 ## later version. 13 ## option) any later version.
14 14
15 ## XEmacs is distributed in the hope that it will be useful, but WITHOUT 15 ## XEmacs is distributed in the hope that it will be useful, but WITHOUT
16 ## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 16 ## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
17 ## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 17 ## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
18 ## for more details. 18 ## for more details.
19 19
20 ## You should have received a copy of the GNU General Public License 20 ## You should have received a copy of the GNU General Public License
21 ## along with XEmacs; see the file COPYING. If not, write to 21 ## along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
22 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
23 ## Boston, MA 02111-1307, USA.
24 22
25 ## Synched up with: Not synched with FSF. 23 ## Synched up with: Not synched with FSF.
26 24
27 .PHONY: all 25 .PHONY: all
28 all: build-the-mofo 26 all: build-the-mofo
130 gui_objs += toolbar.o 128 gui_objs += toolbar.o
131 #endif 129 #endif
132 130
133 #ifdef HAVE_X_WINDOWS 131 #ifdef HAVE_X_WINDOWS
134 x_objs=console-x.o device-x.o event-Xt.o frame-x.o \ 132 x_objs=console-x.o device-x.o event-Xt.o frame-x.o \
135 glyphs-x.o objects-x.o redisplay-x.o select-x.o gccache-x.o intl-x.o 133 glyphs-x.o fontcolor-x.o redisplay-x.o select-x.o gccache-x.o intl-x.o
136 #ifdef HAVE_XFT 134 #ifdef HAVE_XFT
137 x_objs += font-mgr.o 135 x_objs += font-mgr.o
138 #endif 136 #endif
139 x_gui_objs=$(gui_objs:.o=-x.o) 137 x_gui_objs=$(gui_objs:.o=-x.o)
140 #ifdef HAVE_TOOLBARS 138 #ifdef HAVE_TOOLBARS
142 #endif 140 #endif
143 #endif 141 #endif
144 142
145 #ifdef HAVE_MS_WINDOWS 143 #ifdef HAVE_MS_WINDOWS
146 mswindows_objs=console-msw.o device-msw.o event-msw.o frame-msw.o \ 144 mswindows_objs=console-msw.o device-msw.o event-msw.o frame-msw.o \
147 objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o 145 fontcolor-msw.o select-msw.o redisplay-msw.o glyphs-msw.o
148 mswindows_gui_objs=$(gui_objs:.o=-msw.o) 146 mswindows_gui_objs=$(gui_objs:.o=-msw.o)
149 #endif 147 #endif
150 148
151 #ifdef HAVE_TTY 149 #ifdef HAVE_TTY
152 tty_objs=console-tty.o device-tty.o event-tty.o frame-tty.o objects-tty.o \ 150 tty_objs=console-tty.o device-tty.o event-tty.o frame-tty.o fontcolor-tty.o \
153 redisplay-tty.o cm.o 151 redisplay-tty.o cm.o
154 #endif 152 #endif
155 153
156 #ifdef HAVE_GTK 154 #ifdef HAVE_GTK
157 gtk_objs=console-gtk.o device-gtk.o event-gtk.o frame-gtk.o \ 155 gtk_objs=console-gtk.o device-gtk.o event-gtk.o frame-gtk.o \
158 objects-gtk.o redisplay-gtk.o glyphs-gtk.o select-gtk.o gccache-gtk.o \ 156 fontcolor-gtk.o redisplay-gtk.o glyphs-gtk.o select-gtk.o gccache-gtk.o \
159 gtk-xemacs.o ui-gtk.o 157 gtk-xemacs.o ui-gtk.o
160 gtk_gui_objs=$(gui_objs:.o=-gtk.o) 158 gtk_gui_objs=$(gui_objs:.o=-gtk.o)
161 #ifdef HAVE_TOOLBARS 159 #ifdef HAVE_TOOLBARS
162 gtk_gui_objs += toolbar-xlike.o 160 gtk_gui_objs += toolbar-xlike.o
163 #endif 161 #endif
179 debug_objs=debug.o tests.o 177 debug_objs=debug.o tests.o
180 #endif 178 #endif
181 179
182 #ifdef HAVE_UNIXOID_EVENT_LOOP 180 #ifdef HAVE_UNIXOID_EVENT_LOOP
183 event_unixoid_objs=event-unixoid.o 181 event_unixoid_objs=event-unixoid.o
182 #endif
183
184 #ifdef HAVE_WINDOW_SYSTEM
185 glyphs_objs=glyphs-eimage.o glyphs-shared.o
184 #endif 186 #endif
185 187
186 #ifdef HAVE_GPM 188 #ifdef HAVE_GPM
187 gpm_objs=gpmevent.o 189 gpm_objs=gpmevent.o
188 #endif 190 #endif
268 270
269 ## NOTE: The last line cannot be all macros, because make will barf 271 ## NOTE: The last line cannot be all macros, because make will barf
270 ## if they all come out null. 272 ## if they all come out null.
271 273
272 objs=\ 274 objs=\
273 abbrev.o alloc.o alloca.o \ 275 abbrev.o alloc.o alloca.o array.o \
274 $(balloon_help_objs) blocktype.o buffer.o bytecode.o \ 276 $(balloon_help_objs) blocktype.o buffer.o bytecode.o \
275 callint.o casefiddle.o casetab.o chartab.o \ 277 callint.o casefiddle.o casetab.o chartab.o \
276 $(clash_detection_objs) cmdloop.o cmds.o $(coding_system_objs) console.o \ 278 $(clash_detection_objs) cmdloop.o cmds.o $(coding_system_objs) console.o \
277 console-stream.o\ 279 console-stream.o\
278 data.o $(database_objs) $(debug_objs) device.o dired.o doc.o doprnt.o\ 280 data.o $(database_objs) $(debug_objs) device.o dired.o doc.o doprnt.o\
279 dynarr.o \
280 editfns.o elhash.o emacs.o emodules.o eval.o events.o\ 281 editfns.o elhash.o emacs.o emodules.o eval.o events.o\
281 event-stream.o $(event_unixoid_objs) $(extra_objs) extents.o\ 282 event-stream.o $(event_unixoid_objs) $(extra_objs) extents.o\
282 faces.o file-coding.o fileio.o $(LOCK_OBJ) filemode.o floatfns.o fns.o \ 283 faces.o file-coding.o fileio.o $(LOCK_OBJ) filemode.o floatfns.o fns.o \
283 font-lock.o frame.o\ 284 font-lock.o frame.o\
284 gc.o general.o glyphs.o glyphs-eimage.o glyphs-shared.o\ 285 gc.o general.o glyphs.o $(glyphs_objs) glyphs-widget.o \
285 glyphs-widget.o $(gpm_objs) $(gtk_objs) $(gtk_gui_objs) $(gui_objs) \ 286 $(gpm_objs) $(gtk_objs) $(gtk_gui_objs) $(gui_objs) \
286 gutter.o\ 287 gutter.o\
287 hash.o imgproc.o indent.o insdel.o intl.o\ 288 hash.o imgproc.o indent.o insdel.o intl.o\
288 keymap.o $(RTC_patch_objs) line-number.o $(ldap_objs) lread.o lstream.o\ 289 keymap.o $(RTC_patch_objs) line-number.o $(ldap_objs) lread.o lstream.o\
289 $(new_gc_objs) $(vdb_objs) \ 290 $(new_gc_objs) $(vdb_objs) \
290 macros.o marker.o md5.o minibuf.o $(mswindows_objs) $(mswindows_gui_objs)\ 291 macros.o marker.o md5.o minibuf.o $(mswindows_objs) $(mswindows_gui_objs)\
291 $(mule_objs) $(mule_canna_objs) $(mule_wnn_objs) $(number_objs) objects.o\ 292 $(mule_objs) $(mule_canna_objs) $(mule_wnn_objs) $(number_objs) fontcolor.o\
292 opaque.o $(postgresql_objs) print.o process.o $(process_objs) $(profile_objs)\ 293 opaque.o $(postgresql_objs) print.o process.o $(process_objs) $(profile_objs)\
293 rangetab.o realpath.o redisplay.o redisplay-output.o regex.o\ 294 rangetab.o realpath.o redisplay.o redisplay-output.o regex.o\
294 search.o select.o $(sheap_objs) $(shlib_objs) signal.o sound.o\ 295 search.o select.o $(sheap_objs) $(shlib_objs) signal.o sound.o\
295 specifier.o strftime.o $(sunpro_objs) symbols.o syntax.o sysdep.o\ 296 specifier.o strftime.o $(sunpro_objs) symbols.o syntax.o sysdep.o\
296 text.o $(tooltalk_objs) $(tty_objs) undo.o unicode.o $(x_objs) $(x_gui_objs)\ 297 text.o $(tooltalk_objs) $(tty_objs) undo.o unicode.o $(x_objs) $(x_gui_objs)\
880 lint: $(LINTFILES) 881 lint: $(LINTFILES)
881 $(LINT.c) $(LINTFILES) 882 $(LINT.c) $(LINTFILES)
882 883
883 ###################### Automated tests 884 ###################### Automated tests
884 testdir = $(SRC)/../tests/automated 885 testdir = $(SRC)/../tests/automated
885 batch_test_emacs = $(BATCH_PACKAGES) -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir) 886 batch_test_emacs = $(BATCH_PACKAGES) -l test-harness -f batch-test-emacs $(testdir)
886 887
887 ## `config-changed' is useful if you are building both Unicode-internal 888 ## `config-changed' is useful if you are building both Unicode-internal
888 ## and old-Mule workspaces using --srcdir and don't run configure before 889 ## and old-Mule workspaces using --srcdir and don't run configure before
889 ## switching from one to the other. If you rerun configure, update-elc.el 890 ## switching from one to the other. If you rerun configure, update-elc.el
890 ## notices this and automatically removes the two files below, but not 891 ## notices this and automatically removes the two files below, but not