diff options
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 @@ -2003-09-03 Peter Runestig <peter@runestig.com> - - * configure.bat: Create ``makefile'' in directories man, lispref - and lispintro. - - * makefile.w32-in (force-info, info): New targets. - - * envadd.bat: New file. - - * multi-install-info.bat: New file. - 2003-06-27 Jan D. <jan.h.d@swipnet.se> * config.nt (my_strftime): New define. @@ -1031,5 +1020,3 @@ Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. - -;;; 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 @@ directories, etc. We suggest to use djtarnt.exe from the GNU FTP site. - If you are building out of CVS, then some files in this directory - (.bat files, nmake.defs and makefile.w32-in) may need the line-ends - fixing first. The easiest way to do this and avoid future conflicts - is to run the following command in this (emacs/nt) directory: - cvs update -kb - To compile Emacs, you will need either Microsoft Visual C++ 2.0 or later and nmake, or a Windows port of GCC 2.95 or later with Mingw 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) return (0); } - -/* arch-tag: f923609d-b781-4ef4-abce-ca0da29cbbf0 - (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) } /* eof */ - -/* arch-tag: 17e2b0aa-8c17-4bd1-b24b-1cda689245fa - (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) return 0; } - -/* arch-tag: 88678d93-07ac-4e2f-ad63-d4a740ca69ac - (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 (); #define NO_RETURN /* nothing */ #endif #endif - -/* arch-tag: df720992-aa5a-499a-882d-958dc5eeb5e9 - (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 copy /b config.settings+%MAKECMD%.defs+..\nt\makefile.w32-in ..\nt\makefile
copy /b config.settings+%MAKECMD%.defs+..\lib-src\makefile.w32-in ..\lib-src\makefile
copy /b config.settings+%MAKECMD%.defs+..\src\makefile.w32-in ..\src\makefile
-copy /b config.settings+%MAKECMD%.defs+..\man\makefile.w32-in ..\man\makefile
-copy /b config.settings+%MAKECMD%.defs+..\lispref\makefile.w32-in ..\lispref\makefile
-copy /b config.settings+%MAKECMD%.defs+..\lispintro\makefile.w32-in ..\lispintro\makefile
if not exist ..\lisp\Makefile.unix rename ..\lisp\Makefile.in Makefile.unix
if exist ..\lisp\makefile rm -f ../lisp/[Mm]akefile
copy /b config.settings+%MAKECMD%.defs+..\lisp\makefile.w32-in ..\lisp\makefile
@@ -466,7 +463,3 @@ set COMPILER= set MAKECMD=
set usercflags=
set userldflags=
-
-goto skipArchTag
- arch-tag: 300d20a4-1675-4e75-b615-7ce1a8c5376c
-: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) return (0); } - -/* arch-tag: 360d7a99-2cae-447e-8d06-41ca41987e30 - (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 @@ @echo off if (%1) == () nmake -f makefile.nt all if not (%1) == () nmake -f makefile.nt %1 %2 %3 %4 %5 %6 %7 %8 %9 - -goto skipArchTag - arch-tag: f01be12a-fd17-448d-8275-c7f527c50a1f -: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 @@ nmake -f makefile.nt fast_install
-
-goto skipArchTag
- arch-tag: 13c64379-e658-452f-92d3-90d0f230ca70
-: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 if errorlevel 1 goto done
plist ..\src\obj\i386\pemacs > %1
:done
-
-goto skipArchTag
- arch-tag: 927c5199-a8a3-4cf0-ab56-62b66fc6520d
-: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 if errorlevel 1 goto done
plist ..\src\obj\i386\pemacs > %1
:done
-
-goto skipArchTag
- arch-tag: d1c629de-9172-4d72-ab68-9d45ab9903cc
-: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) $(BLD)/%.o: %.c $(CC) $(CFLAGS) $(CC_OUT)$@ $< - -# 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 @@ /* null version of <arpa/inet.h> - <sys/socket.h> has everything */ - -/* arch-tag: 13c7a7f7-40d0-49e8-bdfb-6dcf2f3a7340 - (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 @@ #define gettext_noop(String) String #endif /* _LIBGETTEXT_H */ - -/* arch-tag: 07b35a70-3531-4cda-9674-2968467143ec - (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 @@ /* null version of <netdb.h> - <sys/socket.h> has everything */ - -/* arch-tag: 237ba543-97e2-4bd5-9c9c-32271d955eb1 - (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 @@ /* null version of <netinet/in.h> - <sys/socket.h> has everything */ - -/* arch-tag: 49ff589e-100e-4f8f-8b2a-1c3b542590df - (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; typedef uid_t gid_t; #endif /* _PWD_H_ */ - -/* arch-tag: 68308424-cb2b-49ed-bb52-b347fee416bf - (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 @@ */ #include "..\..\..\src\ndir.h" - -/* arch-tag: 090c9091-3b16-429b-9c40-8aecce1162be - (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 @@ #define R_OK 4 #define D_OK 8 #endif - -/* arch-tag: 7df3e73e-56bc-4ad9-b699-33149ea47959 - (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 @@ * in many of the source files, we just extend the include path so that the * compiler will pick this up empty header instead. */ - -/* arch-tag: c6e9015a-930a-4ad3-b368-ac32f84475d7 - (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 @@ #define NBPG 4096 #endif /* _PARAM_H_ */ - -/* arch-tag: b1d90296-ec38-4839-83bd-0ddfd2528435 - (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; #endif /* _SOCKET_H_ */ /* end of socket.h */ - -/* arch-tag: e3b8b91c-aaa0-4bc4-be57-a85a1dd247b4 - (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 *); #endif /* SYS_TIME_H_INCLUDED */ /* end of sys/time.h */ - -/* arch-tag: bc525883-0c81-4bea-b83d-3325461f38b5 - (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 @@ /* Fake unistd.h: config.h already provides most of the relevant things. */ - -/* arch-tag: 68600bcd-3097-4501-a559-551db3cdb9fd - (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 nmake -f makefile.nt install %1 %2 %3 %4 %5 %6 %7 %8 %9
set INSTALL_DIR=
set BUILD_TYPE=
-
-goto skipArchTag
- arch-tag: 1db5223b-8fc9-4bdb-8ad1-9e3962bf034a
-: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) .c{$(BLD)}.obj:: $(CC) $(CFLAGS) -Fo$(BLD)\ $< !ENDIF - -# 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: realclean: clean - $(DEL_TREE) ..\bin - -# 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: $(MAKE) $(MFLAGS) -C ../lisp install
$(MAKE) $(MFLAGS) -C ../leim install
-force-info:
-# Note that man/makefile knows how to
-# put the info files in $(infodir),
-# so we can do ok running make in the build dir.
-info: force-info
- (cd ..\man && $(MAKE) $(MFLAGS) info)
- (cd ..\lispref && $(MAKE) $(MFLAGS) info)
- (cd ..\lispintro && $(MAKE) $(MFLAGS) info)
-
#
# Maintenance
#
@@ -238,14 +229,8 @@ clean-other-dirs-nmake: $(MAKE) $(MFLAGS) clean
cd ..\lisp
$(MAKE) $(MFLAGS) clean
- cd ..\lispintro
- $(MAKE) $(MFLAGS) clean
- cd ..\lispref
- $(MAKE) $(MFLAGS) clean
cd ..\leim
$(MAKE) $(MFLAGS) clean
- cd ..\man
- $(MAKE) $(MFLAGS) clean
cd ..\nt
clean-other-dirs-gmake:
@@ -273,5 +258,3 @@ cleanall: clean cleanall-other-dirs-$(MAKETYPE) realclean: cleanall
- $(DEL_TREE) ../bin
-
-# 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 .c{$(BLD)}.obj::
$(CC) $(CFLAGS) -Fo$(BLD)\ $<
!ENDIF
-
-# 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. */ macro, and is then used to set the Info-default-directory-list. */ /* #define PATH_INFO "/usr/local/info" */ #define PATH_INFO "C:/emacs/info" - -/* arch-tag: f6d46f3c-e1e9-436b-8629-edcaf6597973 - (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) } /* eof */ - -/* arch-tag: 144ca747-168e-43a0-9736-3f4c0ba1657f - (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: MessageBox (NULL, "Could not start Emacs.", "Error", MB_ICONSTOP); return 1; } - -/* arch-tag: 7e02df73-4df7-4aa0-baea-99c6d047a384 - (do not change this comment) */ |