Mercurial > emacs
comparison make-dist @ 64639:385af3e03206
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
author | Paul Eggert <eggert@twinsun.com> |
---|---|
date | Tue, 26 Jul 2005 21:43:13 +0000 |
parents | c53a9463c31a |
children | 00005df1b3eb 890cc78a5a24 |
comparison
equal
deleted
inserted
replaced
64638:8cbdc86a4f55 | 64639:385af3e03206 |
---|---|
4 #### source tree. This basically creates a duplicate directory | 4 #### source tree. This basically creates a duplicate directory |
5 #### structure, and then hard links into it only those files that should | 5 #### structure, and then hard links into it only those files that should |
6 #### be distributed. This means that if you add a file with an odd name, | 6 #### be distributed. This means that if you add a file with an odd name, |
7 #### you should make sure that this script will include it. | 7 #### you should make sure that this script will include it. |
8 | 8 |
9 # Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002, 2005 | 9 # Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002, 2005 |
10 # Free Software Foundation, Inc. | 10 # Free Software Foundation, Inc. |
11 # | 11 # |
12 # This file is part of GNU Emacs. | 12 # This file is part of GNU Emacs. |
13 # | 13 # |
14 # GNU Emacs is free software; you can redistribute it and/or modify | 14 # GNU Emacs is free software; you can redistribute it and/or modify |
321 leim/SKK-DIC leim/ja-dic leim/quail \ | 321 leim/SKK-DIC leim/ja-dic leim/quail \ |
322 src src/m src/s src/bitmaps lib-src oldXMenu lwlib \ | 322 src src/m src/s src/bitmaps lib-src oldXMenu lwlib \ |
323 nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ | 323 nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ |
324 etc etc/e etc/images etc/images/gnus etc/images/smilies \ | 324 etc etc/e etc/images etc/images/gnus etc/images/smilies \ |
325 etc/tree-widget etc/tree-widget/default etc/tree-widget/folder \ | 325 etc/tree-widget etc/tree-widget/default etc/tree-widget/folder \ |
326 info man msdos vms mac mac/inc mac/inc/sys \ | 326 info man m4 msdos vms mac mac/inc mac/inc/sys \ |
327 mac/src mac/Emacs.app mac/Emacs.app/Contents \ | 327 mac/src mac/Emacs.app mac/Emacs.app/Contents \ |
328 mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \ | 328 mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \ |
329 mac/Emacs.app/Contents/Resources/English.lproj | 329 mac/Emacs.app/Contents/Resources/English.lproj |
330 do | 330 do |
331 echo " ${tempdir}/${subdir}" | 331 echo " ${tempdir}/${subdir}" |
485 chmod a-w ../${tempdir}/lib-src/$file | 485 chmod a-w ../${tempdir}/lib-src/$file |
486 fi | 486 fi |
487 done | 487 done |
488 cd ../${tempdir}/lib-src | 488 cd ../${tempdir}/lib-src |
489 rm -f Makefile.c | 489 rm -f Makefile.c |
490 rm -f getopt.h | |
490 rm -f =* TAGS) | 491 rm -f =* TAGS) |
492 | |
493 echo "Making links to \`m4'" | |
494 (cd m4 | |
495 ln *.m4 ../${tempdir}/m4) | |
491 | 496 |
492 echo "Making links to \`nt'" | 497 echo "Making links to \`nt'" |
493 (cd nt | 498 (cd nt |
494 ln emacs.rc config.nt [a-z]*.c ../${tempdir}/nt | 499 ln emacs.rc config.nt [a-z]*.c ../${tempdir}/nt |
495 ln nmake.defs gmake.defs subdirs.el ../${tempdir}/nt | 500 ln nmake.defs gmake.defs subdirs.el ../${tempdir}/nt |