diff options
| author | Kenichi Handa | 2003-09-08 11:56:09 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2003-09-08 11:56:09 +0000 |
| commit | 463f5630a5e7cbe7f042bc1175d1fa1c4e98860f (patch) | |
| tree | 3287d0c628fea2249abf4635b3a4f45bedd6f8c4 /nt | |
| parent | 4256310de631bd57c78b88b5131caa073315b3d7 (diff) | |
| download | emacs-463f5630a5e7cbe7f042bc1175d1fa1c4e98860f.tar.gz emacs-463f5630a5e7cbe7f042bc1175d1fa1c4e98860f.zip | |
New directory
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 13 | ||||
| -rw-r--r-- | nt/INSTALL | 6 | ||||
| -rw-r--r-- | nt/addpm.c | 3 | ||||
| -rw-r--r-- | nt/addsection.c | 3 | ||||
| -rw-r--r-- | nt/cmdproxy.c | 3 | ||||
| -rw-r--r-- | nt/config.nt | 3 | ||||
| -rwxr-xr-x | nt/configure.bat | 7 | ||||
| -rw-r--r-- | nt/ddeclient.c | 3 | ||||
| -rwxr-xr-x | nt/ebuild.bat | 4 | ||||
| -rwxr-xr-x | nt/fast-install.bat | 4 | ||||
| -rwxr-xr-x | nt/ftime-nostartup.bat | 4 | ||||
| -rw-r--r-- | nt/ftime.bat | 4 | ||||
| -rw-r--r-- | nt/gmake.defs | 2 | ||||
| -rw-r--r-- | nt/inc/arpa/inet.h | 3 | ||||
| -rwxr-xr-x | nt/inc/gettext.h | 3 | ||||
| -rw-r--r-- | nt/inc/netdb.h | 3 | ||||
| -rw-r--r-- | nt/inc/netinet/in.h | 3 | ||||
| -rw-r--r-- | nt/inc/pwd.h | 3 | ||||
| -rw-r--r-- | nt/inc/sys/dir.h | 3 | ||||
| -rw-r--r-- | nt/inc/sys/file.h | 3 | ||||
| -rw-r--r-- | nt/inc/sys/ioctl.h | 3 | ||||
| -rw-r--r-- | nt/inc/sys/param.h | 3 | ||||
| -rw-r--r-- | nt/inc/sys/socket.h | 3 | ||||
| -rw-r--r-- | nt/inc/sys/time.h | 3 | ||||
| -rw-r--r-- | nt/inc/unistd.h | 3 | ||||
| -rwxr-xr-x | nt/install.bat | 4 | ||||
| -rw-r--r-- | nt/makefile.def | 2 | ||||
| -rw-r--r-- | nt/makefile.nt | 2 | ||||
| -rw-r--r-- | nt/makefile.w32-in | 17 | ||||
| -rw-r--r-- | nt/nmake.defs | 2 | ||||
| -rw-r--r-- | nt/paths.h | 3 | ||||
| -rw-r--r-- | nt/preprep.c | 3 | ||||
| -rw-r--r-- | nt/runemacs.c | 3 |
33 files changed, 0 insertions, 131 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 2fa4492110f..6b339a9458f 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,14 +1,3 @@ | |||
| 1 | 2003-09-03 Peter Runestig <peter@runestig.com> | ||
| 2 | |||
| 3 | * configure.bat: Create ``makefile'' in directories man, lispref | ||
| 4 | and lispintro. | ||
| 5 | |||
| 6 | * makefile.w32-in (force-info, info): New targets. | ||
| 7 | |||
| 8 | * envadd.bat: New file. | ||
| 9 | |||
| 10 | * multi-install-info.bat: New file. | ||
| 11 | |||
| 12 | 2003-06-27 Jan D. <jan.h.d@swipnet.se> | 1 | 2003-06-27 Jan D. <jan.h.d@swipnet.se> |
| 13 | 2 | ||
| 14 | * config.nt (my_strftime): New define. | 3 | * config.nt (my_strftime): New define. |
| @@ -1031,5 +1020,3 @@ | |||
| 1031 | Free Software Foundation, Inc. | 1020 | Free Software Foundation, Inc. |
| 1032 | Copying and distribution of this file, with or without modification, | 1021 | Copying and distribution of this file, with or without modification, |
| 1033 | are permitted provided the copyright notice and this notice are preserved. | 1022 | are permitted provided the copyright notice and this notice are preserved. |
| 1034 | |||
| 1035 | ;;; arch-tag: b3d2c29c-04a0-45d0-b52d-57354711c414 | ||
diff --git a/nt/INSTALL b/nt/INSTALL index 273c6b1e16b..b465af6e402 100644 --- a/nt/INSTALL +++ b/nt/INSTALL | |||
| @@ -11,12 +11,6 @@ | |||
| 11 | directories, etc. We suggest to use djtarnt.exe from the GNU FTP | 11 | directories, etc. We suggest to use djtarnt.exe from the GNU FTP |
| 12 | site. | 12 | site. |
| 13 | 13 | ||
| 14 | If you are building out of CVS, then some files in this directory | ||
| 15 | (.bat files, nmake.defs and makefile.w32-in) may need the line-ends | ||
| 16 | fixing first. The easiest way to do this and avoid future conflicts | ||
| 17 | is to run the following command in this (emacs/nt) directory: | ||
| 18 | cvs update -kb | ||
| 19 | |||
| 20 | To compile Emacs, you will need either Microsoft Visual C++ 2.0 or | 14 | To compile Emacs, you will need either Microsoft Visual C++ 2.0 or |
| 21 | later and nmake, or a Windows port of GCC 2.95 or later with Mingw | 15 | later and nmake, or a Windows port of GCC 2.95 or later with Mingw |
| 22 | and W32 API support and a port of GNU make. You can use the Cygwin | 16 | and W32 API support and a port of GNU make. You can use the Cygwin |
diff --git a/nt/addpm.c b/nt/addpm.c index ccae76c1f20..fa0f4253abb 100644 --- a/nt/addpm.c +++ b/nt/addpm.c | |||
| @@ -203,6 +203,3 @@ main (argc, argv) | |||
| 203 | 203 | ||
| 204 | return (0); | 204 | return (0); |
| 205 | } | 205 | } |
| 206 | |||
| 207 | /* arch-tag: f923609d-b781-4ef4-abce-ca0da29cbbf0 | ||
| 208 | (do not change this comment) */ | ||
diff --git a/nt/addsection.c b/nt/addsection.c index ae44c7f943c..f9eff2f73f6 100644 --- a/nt/addsection.c +++ b/nt/addsection.c | |||
| @@ -534,6 +534,3 @@ main (int argc, char **argv) | |||
| 534 | } | 534 | } |
| 535 | 535 | ||
| 536 | /* eof */ | 536 | /* eof */ |
| 537 | |||
| 538 | /* arch-tag: 17e2b0aa-8c17-4bd1-b24b-1cda689245fa | ||
| 539 | (do not change this comment) */ | ||
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c index 52760402f1b..9280f29c351 100644 --- a/nt/cmdproxy.c +++ b/nt/cmdproxy.c | |||
| @@ -699,6 +699,3 @@ main (int argc, char ** argv) | |||
| 699 | 699 | ||
| 700 | return 0; | 700 | return 0; |
| 701 | } | 701 | } |
| 702 | |||
| 703 | /* arch-tag: 88678d93-07ac-4e2f-ad63-d4a740ca69ac | ||
| 704 | (do not change this comment) */ | ||
diff --git a/nt/config.nt b/nt/config.nt index 56ec72a56a6..e774fcbe292 100644 --- a/nt/config.nt +++ b/nt/config.nt | |||
| @@ -468,6 +468,3 @@ extern char *getenv (); | |||
| 468 | #define NO_RETURN /* nothing */ | 468 | #define NO_RETURN /* nothing */ |
| 469 | #endif | 469 | #endif |
| 470 | #endif | 470 | #endif |
| 471 | |||
| 472 | /* arch-tag: df720992-aa5a-499a-882d-958dc5eeb5e9 | ||
| 473 | (do not change this comment) */ | ||
diff --git a/nt/configure.bat b/nt/configure.bat index a27bbcd8cdd..c6709ef8df5 100755 --- a/nt/configure.bat +++ b/nt/configure.bat | |||
| @@ -433,9 +433,6 @@ copy paths.h ..\src\epaths.h | |||
| 433 | copy /b config.settings+%MAKECMD%.defs+..\nt\makefile.w32-in ..\nt\makefile | 433 | copy /b config.settings+%MAKECMD%.defs+..\nt\makefile.w32-in ..\nt\makefile |
| 434 | copy /b config.settings+%MAKECMD%.defs+..\lib-src\makefile.w32-in ..\lib-src\makefile | 434 | copy /b config.settings+%MAKECMD%.defs+..\lib-src\makefile.w32-in ..\lib-src\makefile |
| 435 | copy /b config.settings+%MAKECMD%.defs+..\src\makefile.w32-in ..\src\makefile | 435 | copy /b config.settings+%MAKECMD%.defs+..\src\makefile.w32-in ..\src\makefile |
| 436 | copy /b config.settings+%MAKECMD%.defs+..\man\makefile.w32-in ..\man\makefile | ||
| 437 | copy /b config.settings+%MAKECMD%.defs+..\lispref\makefile.w32-in ..\lispref\makefile | ||
| 438 | copy /b config.settings+%MAKECMD%.defs+..\lispintro\makefile.w32-in ..\lispintro\makefile | ||
| 439 | if not exist ..\lisp\Makefile.unix rename ..\lisp\Makefile.in Makefile.unix | 436 | if not exist ..\lisp\Makefile.unix rename ..\lisp\Makefile.in Makefile.unix |
| 440 | if exist ..\lisp\makefile rm -f ../lisp/[Mm]akefile | 437 | if exist ..\lisp\makefile rm -f ../lisp/[Mm]akefile |
| 441 | copy /b config.settings+%MAKECMD%.defs+..\lisp\makefile.w32-in ..\lisp\makefile | 438 | copy /b config.settings+%MAKECMD%.defs+..\lisp\makefile.w32-in ..\lisp\makefile |
| @@ -466,7 +463,3 @@ set COMPILER= | |||
| 466 | set MAKECMD= | 463 | set MAKECMD= |
| 467 | set usercflags= | 464 | set usercflags= |
| 468 | set userldflags= | 465 | set userldflags= |
| 469 | |||
| 470 | goto skipArchTag | ||
| 471 | arch-tag: 300d20a4-1675-4e75-b615-7ce1a8c5376c | ||
| 472 | :skipArchTag | ||
diff --git a/nt/ddeclient.c b/nt/ddeclient.c index 712c28f1c32..3a82395ca30 100644 --- a/nt/ddeclient.c +++ b/nt/ddeclient.c | |||
| @@ -74,6 +74,3 @@ main (argc, argv) | |||
| 74 | 74 | ||
| 75 | return (0); | 75 | return (0); |
| 76 | } | 76 | } |
| 77 | |||
| 78 | /* arch-tag: 360d7a99-2cae-447e-8d06-41ca41987e30 | ||
| 79 | (do not change this comment) */ | ||
diff --git a/nt/ebuild.bat b/nt/ebuild.bat index c7851779cc5..f4ae8eccb8c 100755 --- a/nt/ebuild.bat +++ b/nt/ebuild.bat | |||
| @@ -1,7 +1,3 @@ | |||
| 1 | @echo off | 1 | @echo off |
| 2 | if (%1) == () nmake -f makefile.nt all | 2 | if (%1) == () nmake -f makefile.nt all |
| 3 | if not (%1) == () nmake -f makefile.nt %1 %2 %3 %4 %5 %6 %7 %8 %9 | 3 | if not (%1) == () nmake -f makefile.nt %1 %2 %3 %4 %5 %6 %7 %8 %9 |
| 4 | |||
| 5 | goto skipArchTag | ||
| 6 | arch-tag: f01be12a-fd17-448d-8275-c7f527c50a1f | ||
| 7 | :skipArchTag | ||
diff --git a/nt/fast-install.bat b/nt/fast-install.bat index 11e969eb5a4..157c4ab8751 100755 --- a/nt/fast-install.bat +++ b/nt/fast-install.bat | |||
| @@ -1,5 +1 @@ | |||
| 1 | nmake -f makefile.nt fast_install | nmake -f makefile.nt fast_install | |
| 2 | |||
| 3 | goto skipArchTag | ||
| 4 | arch-tag: 13c64379-e658-452f-92d3-90d0f230ca70 | ||
| 5 | :skipArchTag | ||
diff --git a/nt/ftime-nostartup.bat b/nt/ftime-nostartup.bat index 40f0a376285..501e4384075 100755 --- a/nt/ftime-nostartup.bat +++ b/nt/ftime-nostartup.bat | |||
| @@ -21,7 +21,3 @@ prep /m ..\src\obj\i386\pemacs | |||
| 21 | if errorlevel 1 goto done | 21 | if errorlevel 1 goto done |
| 22 | plist ..\src\obj\i386\pemacs > %1 | 22 | plist ..\src\obj\i386\pemacs > %1 |
| 23 | :done | 23 | :done |
| 24 | |||
| 25 | goto skipArchTag | ||
| 26 | arch-tag: 927c5199-a8a3-4cf0-ab56-62b66fc6520d | ||
| 27 | :skipArchTag | ||
diff --git a/nt/ftime.bat b/nt/ftime.bat index beb87af459b..7ad22afc2ce 100644 --- a/nt/ftime.bat +++ b/nt/ftime.bat | |||
| @@ -21,7 +21,3 @@ prep /m ..\src\obj\i386\pemacs | |||
| 21 | if errorlevel 1 goto done | 21 | if errorlevel 1 goto done |
| 22 | plist ..\src\obj\i386\pemacs > %1 | 22 | plist ..\src\obj\i386\pemacs > %1 |
| 23 | :done | 23 | :done |
| 24 | |||
| 25 | goto skipArchTag | ||
| 26 | arch-tag: d1c629de-9172-4d72-ab68-9d45ab9903cc | ||
| 27 | :skipArchTag | ||
diff --git a/nt/gmake.defs b/nt/gmake.defs index 0bf3f48dd6e..afa1b855d94 100644 --- a/nt/gmake.defs +++ b/nt/gmake.defs | |||
| @@ -269,5 +269,3 @@ LINK_FLAGS = $(ARCH_LDFLAGS) $(DEBUG_LINK) $(NOCYGWIN) $(USER_LDFLAGS) | |||
| 269 | 269 | ||
| 270 | $(BLD)/%.o: %.c | 270 | $(BLD)/%.o: %.c |
| 271 | $(CC) $(CFLAGS) $(CC_OUT)$@ $< | 271 | $(CC) $(CFLAGS) $(CC_OUT)$@ $< |
| 272 | |||
| 273 | # arch-tag: 35eb9662-8534-4bcf-b891-0730a09d657f | ||
diff --git a/nt/inc/arpa/inet.h b/nt/inc/arpa/inet.h index 9074508a1d3..f5d197c06e1 100644 --- a/nt/inc/arpa/inet.h +++ b/nt/inc/arpa/inet.h | |||
| @@ -1,4 +1 @@ | |||
| 1 | /* null version of <arpa/inet.h> - <sys/socket.h> has everything */ | /* null version of <arpa/inet.h> - <sys/socket.h> has everything */ | |
| 2 | |||
| 3 | /* arch-tag: 13c7a7f7-40d0-49e8-bdfb-6dcf2f3a7340 | ||
| 4 | (do not change this comment) */ | ||
diff --git a/nt/inc/gettext.h b/nt/inc/gettext.h index 148da8b36d0..8b262f4cfd7 100755 --- a/nt/inc/gettext.h +++ b/nt/inc/gettext.h | |||
| @@ -67,6 +67,3 @@ | |||
| 67 | #define gettext_noop(String) String | 67 | #define gettext_noop(String) String |
| 68 | 68 | ||
| 69 | #endif /* _LIBGETTEXT_H */ | 69 | #endif /* _LIBGETTEXT_H */ |
| 70 | |||
| 71 | /* arch-tag: 07b35a70-3531-4cda-9674-2968467143ec | ||
| 72 | (do not change this comment) */ | ||
diff --git a/nt/inc/netdb.h b/nt/inc/netdb.h index bdb1ce546ca..5bf232e7f5c 100644 --- a/nt/inc/netdb.h +++ b/nt/inc/netdb.h | |||
| @@ -1,4 +1 @@ | |||
| 1 | /* null version of <netdb.h> - <sys/socket.h> has everything */ | /* null version of <netdb.h> - <sys/socket.h> has everything */ | |
| 2 | |||
| 3 | /* arch-tag: 237ba543-97e2-4bd5-9c9c-32271d955eb1 | ||
| 4 | (do not change this comment) */ | ||
diff --git a/nt/inc/netinet/in.h b/nt/inc/netinet/in.h index 2e4f1e1a7ee..46fb0faccea 100644 --- a/nt/inc/netinet/in.h +++ b/nt/inc/netinet/in.h | |||
| @@ -1,4 +1 @@ | |||
| 1 | /* null version of <netinet/in.h> - <sys/socket.h> has everything */ | /* null version of <netinet/in.h> - <sys/socket.h> has everything */ | |
| 2 | |||
| 3 | /* arch-tag: 49ff589e-100e-4f8f-8b2a-1c3b542590df | ||
| 4 | (do not change this comment) */ | ||
diff --git a/nt/inc/pwd.h b/nt/inc/pwd.h index 11f5669b0f0..ba3d32e70f7 100644 --- a/nt/inc/pwd.h +++ b/nt/inc/pwd.h | |||
| @@ -19,6 +19,3 @@ typedef int uid_t; | |||
| 19 | typedef uid_t gid_t; | 19 | typedef uid_t gid_t; |
| 20 | 20 | ||
| 21 | #endif /* _PWD_H_ */ | 21 | #endif /* _PWD_H_ */ |
| 22 | |||
| 23 | /* arch-tag: 68308424-cb2b-49ed-bb52-b347fee416bf | ||
| 24 | (do not change this comment) */ | ||
diff --git a/nt/inc/sys/dir.h b/nt/inc/sys/dir.h index e317d008d20..203e27f2fe7 100644 --- a/nt/inc/sys/dir.h +++ b/nt/inc/sys/dir.h | |||
| @@ -3,6 +3,3 @@ | |||
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include "..\..\..\src\ndir.h" | 5 | #include "..\..\..\src\ndir.h" |
| 6 | |||
| 7 | /* arch-tag: 090c9091-3b16-429b-9c40-8aecce1162be | ||
| 8 | (do not change this comment) */ | ||
diff --git a/nt/inc/sys/file.h b/nt/inc/sys/file.h index 4460da09279..6a3fcc13e89 100644 --- a/nt/inc/sys/file.h +++ b/nt/inc/sys/file.h | |||
| @@ -9,6 +9,3 @@ | |||
| 9 | #define R_OK 4 | 9 | #define R_OK 4 |
| 10 | #define D_OK 8 | 10 | #define D_OK 8 |
| 11 | #endif | 11 | #endif |
| 12 | |||
| 13 | /* arch-tag: 7df3e73e-56bc-4ad9-b699-33149ea47959 | ||
| 14 | (do not change this comment) */ | ||
diff --git a/nt/inc/sys/ioctl.h b/nt/inc/sys/ioctl.h index b3c6b3b107b..dc0957873da 100644 --- a/nt/inc/sys/ioctl.h +++ b/nt/inc/sys/ioctl.h | |||
| @@ -3,6 +3,3 @@ | |||
| 3 | * in many of the source files, we just extend the include path so that the | 3 | * in many of the source files, we just extend the include path so that the |
| 4 | * compiler will pick this up empty header instead. | 4 | * compiler will pick this up empty header instead. |
| 5 | */ | 5 | */ |
| 6 | |||
| 7 | /* arch-tag: c6e9015a-930a-4ad3-b368-ac32f84475d7 | ||
| 8 | (do not change this comment) */ | ||
diff --git a/nt/inc/sys/param.h b/nt/inc/sys/param.h index 971d4b10755..397c5ffae66 100644 --- a/nt/inc/sys/param.h +++ b/nt/inc/sys/param.h | |||
| @@ -8,6 +8,3 @@ | |||
| 8 | #define NBPG 4096 | 8 | #define NBPG 4096 |
| 9 | 9 | ||
| 10 | #endif /* _PARAM_H_ */ | 10 | #endif /* _PARAM_H_ */ |
| 11 | |||
| 12 | /* arch-tag: b1d90296-ec38-4839-83bd-0ddfd2528435 | ||
| 13 | (do not change this comment) */ | ||
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h index 422a27d1b52..f5a17eafba4 100644 --- a/nt/inc/sys/socket.h +++ b/nt/inc/sys/socket.h | |||
| @@ -163,6 +163,3 @@ extern int h_errno; | |||
| 163 | #endif /* _SOCKET_H_ */ | 163 | #endif /* _SOCKET_H_ */ |
| 164 | 164 | ||
| 165 | /* end of socket.h */ | 165 | /* end of socket.h */ |
| 166 | |||
| 167 | /* arch-tag: e3b8b91c-aaa0-4bc4-be57-a85a1dd247b4 | ||
| 168 | (do not change this comment) */ | ||
diff --git a/nt/inc/sys/time.h b/nt/inc/sys/time.h index a3808f4c5c5..881808c5323 100644 --- a/nt/inc/sys/time.h +++ b/nt/inc/sys/time.h | |||
| @@ -21,6 +21,3 @@ void gettimeofday (struct timeval *, struct timezone *); | |||
| 21 | #endif /* SYS_TIME_H_INCLUDED */ | 21 | #endif /* SYS_TIME_H_INCLUDED */ |
| 22 | 22 | ||
| 23 | /* end of sys/time.h */ | 23 | /* end of sys/time.h */ |
| 24 | |||
| 25 | /* arch-tag: bc525883-0c81-4bea-b83d-3325461f38b5 | ||
| 26 | (do not change this comment) */ | ||
diff --git a/nt/inc/unistd.h b/nt/inc/unistd.h index 9bf9cb75971..c1caa77a697 100644 --- a/nt/inc/unistd.h +++ b/nt/inc/unistd.h | |||
| @@ -1,4 +1 @@ | |||
| 1 | /* Fake unistd.h: config.h already provides most of the relevant things. */ | /* Fake unistd.h: config.h already provides most of the relevant things. */ | |
| 2 | |||
| 3 | /* arch-tag: 68600bcd-3097-4501-a559-551db3cdb9fd | ||
| 4 | (do not change this comment) */ | ||
diff --git a/nt/install.bat b/nt/install.bat index 1074c03454b..be0e9045e5d 100755 --- a/nt/install.bat +++ b/nt/install.bat | |||
| @@ -6,7 +6,3 @@ if not (%1) == () shift | |||
| 6 | nmake -f makefile.nt install %1 %2 %3 %4 %5 %6 %7 %8 %9 | 6 | nmake -f makefile.nt install %1 %2 %3 %4 %5 %6 %7 %8 %9 |
| 7 | set INSTALL_DIR= | 7 | set INSTALL_DIR= |
| 8 | set BUILD_TYPE= | 8 | set BUILD_TYPE= |
| 9 | |||
| 10 | goto skipArchTag | ||
| 11 | arch-tag: 1db5223b-8fc9-4bdb-8ad1-9e3962bf034a | ||
| 12 | :skipArchTag | ||
diff --git a/nt/makefile.def b/nt/makefile.def index 224d4619b6b..24003eb309f 100644 --- a/nt/makefile.def +++ b/nt/makefile.def | |||
| @@ -228,5 +228,3 @@ ARCH_LDFLAGS = -align:0x1000 $(SYS_LDFLAGS) | |||
| 228 | .c{$(BLD)}.obj:: | 228 | .c{$(BLD)}.obj:: |
| 229 | $(CC) $(CFLAGS) -Fo$(BLD)\ $< | 229 | $(CC) $(CFLAGS) -Fo$(BLD)\ $< |
| 230 | !ENDIF | 230 | !ENDIF |
| 231 | |||
| 232 | # arch-tag: a8aa26d5-5f28-4263-b42a-6f91acb7d824 | ||
diff --git a/nt/makefile.nt b/nt/makefile.nt index 4a92f7f3e1f..d9ca04dabdf 100644 --- a/nt/makefile.nt +++ b/nt/makefile.nt | |||
| @@ -210,5 +210,3 @@ clean: | |||
| 210 | 210 | ||
| 211 | realclean: clean | 211 | realclean: clean |
| 212 | - $(DEL_TREE) ..\bin | 212 | - $(DEL_TREE) ..\bin |
| 213 | |||
| 214 | # arch-tag: b01debf7-6859-439e-b08e-f041aa03c32f | ||
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 1f1acccb6f0..4e8265f4da0 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in | |||
| @@ -214,15 +214,6 @@ install-other-dirs-gmake: | |||
| 214 | $(MAKE) $(MFLAGS) -C ../lisp install | 214 | $(MAKE) $(MFLAGS) -C ../lisp install |
| 215 | $(MAKE) $(MFLAGS) -C ../leim install | 215 | $(MAKE) $(MFLAGS) -C ../leim install |
| 216 | 216 | ||
| 217 | force-info: | ||
| 218 | # Note that man/makefile knows how to | ||
| 219 | # put the info files in $(infodir), | ||
| 220 | # so we can do ok running make in the build dir. | ||
| 221 | info: force-info | ||
| 222 | (cd ..\man && $(MAKE) $(MFLAGS) info) | ||
| 223 | (cd ..\lispref && $(MAKE) $(MFLAGS) info) | ||
| 224 | (cd ..\lispintro && $(MAKE) $(MFLAGS) info) | ||
| 225 | |||
| 226 | # | 217 | # |
| 227 | # Maintenance | 218 | # Maintenance |
| 228 | # | 219 | # |
| @@ -238,14 +229,8 @@ clean-other-dirs-nmake: | |||
| 238 | $(MAKE) $(MFLAGS) clean | 229 | $(MAKE) $(MFLAGS) clean |
| 239 | cd ..\lisp | 230 | cd ..\lisp |
| 240 | $(MAKE) $(MFLAGS) clean | 231 | $(MAKE) $(MFLAGS) clean |
| 241 | cd ..\lispintro | ||
| 242 | $(MAKE) $(MFLAGS) clean | ||
| 243 | cd ..\lispref | ||
| 244 | $(MAKE) $(MFLAGS) clean | ||
| 245 | cd ..\leim | 232 | cd ..\leim |
| 246 | $(MAKE) $(MFLAGS) clean | 233 | $(MAKE) $(MFLAGS) clean |
| 247 | cd ..\man | ||
| 248 | $(MAKE) $(MFLAGS) clean | ||
| 249 | cd ..\nt | 234 | cd ..\nt |
| 250 | 235 | ||
| 251 | clean-other-dirs-gmake: | 236 | clean-other-dirs-gmake: |
| @@ -273,5 +258,3 @@ cleanall: clean cleanall-other-dirs-$(MAKETYPE) | |||
| 273 | 258 | ||
| 274 | realclean: cleanall | 259 | realclean: cleanall |
| 275 | - $(DEL_TREE) ../bin | 260 | - $(DEL_TREE) ../bin |
| 276 | |||
| 277 | # arch-tag: 6f5b23a6-774b-4598-9c29-58235b2b4219 | ||
diff --git a/nt/nmake.defs b/nt/nmake.defs index f18b9e06405..99db4211f1b 100644 --- a/nt/nmake.defs +++ b/nt/nmake.defs | |||
| @@ -230,5 +230,3 @@ EXTRA_LINK = -profile | |||
| 230 | .c{$(BLD)}.obj:: | 230 | .c{$(BLD)}.obj:: |
| 231 | $(CC) $(CFLAGS) -Fo$(BLD)\ $< | 231 | $(CC) $(CFLAGS) -Fo$(BLD)\ $< |
| 232 | !ENDIF | 232 | !ENDIF |
| 233 | |||
| 234 | # arch-tag: fefa49b0-c23c-46c7-9094-cab2a405058e | ||
diff --git a/nt/paths.h b/nt/paths.h index 64258d12ad7..9a730e33153 100644 --- a/nt/paths.h +++ b/nt/paths.h | |||
| @@ -60,6 +60,3 @@ Boston, MA 02111-1307, USA. */ | |||
| 60 | macro, and is then used to set the Info-default-directory-list. */ | 60 | macro, and is then used to set the Info-default-directory-list. */ |
| 61 | /* #define PATH_INFO "/usr/local/info" */ | 61 | /* #define PATH_INFO "/usr/local/info" */ |
| 62 | #define PATH_INFO "C:/emacs/info" | 62 | #define PATH_INFO "C:/emacs/info" |
| 63 | |||
| 64 | /* arch-tag: f6d46f3c-e1e9-436b-8629-edcaf6597973 | ||
| 65 | (do not change this comment) */ | ||
diff --git a/nt/preprep.c b/nt/preprep.c index dfc6c7e6fa1..64cd1b73916 100644 --- a/nt/preprep.c +++ b/nt/preprep.c | |||
| @@ -827,6 +827,3 @@ main (int argc, char **argv) | |||
| 827 | } | 827 | } |
| 828 | 828 | ||
| 829 | /* eof */ | 829 | /* eof */ |
| 830 | |||
| 831 | /* arch-tag: 144ca747-168e-43a0-9736-3f4c0ba1657f | ||
| 832 | (do not change this comment) */ | ||
diff --git a/nt/runemacs.c b/nt/runemacs.c index cdd46a6008d..2f114aea659 100644 --- a/nt/runemacs.c +++ b/nt/runemacs.c | |||
| @@ -144,6 +144,3 @@ error: | |||
| 144 | MessageBox (NULL, "Could not start Emacs.", "Error", MB_ICONSTOP); | 144 | MessageBox (NULL, "Could not start Emacs.", "Error", MB_ICONSTOP); |
| 145 | return 1; | 145 | return 1; |
| 146 | } | 146 | } |
| 147 | |||
| 148 | /* arch-tag: 7e02df73-4df7-4aa0-baea-99c6d047a384 | ||
| 149 | (do not change this comment) */ | ||