HCoop / bpt / emacs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
(ctl-x-map): Delete the C-x C-q binding for toggle-read-only.
[bpt/emacs.git] / nt / makefile.nt
diff --git a/nt/makefile.nt b/nt/makefile.nt
index f3ce9ba..336dbfc 100644 (file)
--- a/nt/makefile.nt
+++ b/nt/makefile.nt
@@ -15,21 +15,44 @@
 #  
 #  You should have received a copy of the GNU General Public License
 #  along with GNU Emacs; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+#  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+#  Boston, MA 02111-1307, USA.
 #
 #   Geoff Voelker (voelker@cs.washington.edu)  11-20-93
 #                                                9-6-94
 !include makefile.def
 
-ALL            = $(BLD)\addpm.exe
+ALL            = $(BLD)\addpm.exe $(BLD)\runemacs.exe
+!if $(MSVCNT11)
+TRES           = $(BLD)\emacs.res
+!else
+TRES           = $(BLD)\emacs.rbj
+!endif
+
+.c{$(BLD)}.obj:
+                 $(CC) $(CFLAGS) -Fo$@ $<
 
 addpm:           $(BLD) $(BLD)\addpm.exe
-$(BLD)\addpm.exe: $(BLD)\addpm.obj
 $(BLD)\addpm.obj: addpm.c
-                 $(CC) $(CFLAGS) -nologo -out:$@ addpm.c \
-                       -link -out:$(BLD)\addpm.exe \
-                       -subsystem:windows -entry:WinMainCRTStartup \
-                       $(SYS_LDFLAGS) $(BASE_LIBS) user32.lib
+$(BLD)\addpm.exe: $(BLD)\addpm.obj
+                 $(LINK) -out:$@ -subsystem:console -entry:mainCRTStartup \
+                 $(SYS_LDFLAGS) $** $(BASE_LIBS) $(ADVAPI32) user32.lib
+
+#
+# The resource file.  NT 3.10 requires the use of cvtres; even though
+# it is not necessary on later versions, it is still ok to use it.
+#
+$(TRES):       emacs.rc
+               $(RC) -Fo$(BLD)\emacs.res $**
+!if !$(MSVCNT11)
+               $(CVTRES) -r -$(ARCH) -o $@ $(BLD)\emacs.res
+!endif
+
+runemacs:        $(BLD) $(BLD)\runemacs.exe
+$(BLD)\runemacs.obj: runemacs.c
+$(BLD)\runemacs.exe: $(BLD)\runemacs.obj $(TRES)
+                 $(LINK) -out:$@ -subsystem:windows -entry:WinMainCRTStartup \
+                 $(SYS_LDFLAGS) $** $(BASE_LIBS) $(ADVAPI32) user32.lib
 
 # Since Windows 95 does not support multiple commands on one command line
 # (e.g., in for loops), we cannot use for loops any more.
@@ -69,13 +92,15 @@ install:    all emacs.bat
                $(INSTALL_CMD)
                cd ..\nt                
                - $(CP) emacs.bat $(INSTALL_DIR)\bin
-               - $(ADDPM) $(INSTALL_DIR)\bin\emacs.bat $(EMACS_ICON_PATH)
-               - del /q ..\same-dir.tst
-               - del /q $(INSTALL_DIR)\same-dir.tst
-               echo SameDirTest > ..\same-dir.tst
-               if not exist $(INSTALL_DIR)\same-dir.tst $(MAKE) -f makefile.nt real_install
-               - del /q ..\same-dir.tst
-               - del /q $(INSTALL_DIR)\same-dir.tst
+               - $(CP) $(BLD)\addpm.exe $(INSTALL_DIR)\bin
+               - $(CP) $(BLD)\runemacs.exe $(INSTALL_DIR)\bin
+               - $(ADDPM) $(INSTALL_DIR)
+               - $(DEL) ..\same-dir.tst
+               - $(DEL) $(INSTALL_DIR)\same-dir.tst
+               echo SameDirTest > $(INSTALL_DIR)\same-dir.tst
+               if not exist ..\same-dir.tst $(MAKE) -f makefile.nt real_install
+               - $(DEL) ..\same-dir.tst
+               - $(DEL) $(INSTALL_DIR)\same-dir.tst
 
 #
 # This installs executables from ..\bin into the installation directory
@@ -86,37 +111,42 @@ fast_install:
                $(CP) ..\lib-src\DOC $(INSTALL_DIR)\etc
                - mkdir $(INSTALL_DIR)\bin
                - $(CP) emacs.bat $(INSTALL_DIR)\bin
-               - del /q ..\same-dir.tst
-               - del /q $(INSTALL_DIR)\same-dir.tst
-               echo SameDirTest > ..\same-dir.tst
-               if not exist $(INSTALL_DIR)\same-dir.tst $(CP) ..\bin\emacs.exe $(INSTALL_DIR)\bin
-               if not exist $(INSTALL_DIR)\same-dir.tst $(CP) ..\bin\etags.exe $(INSTALL_DIR)\bin
-               if not exist $(INSTALL_DIR)\same-dir.tst $(CP) ..\bin\ctags.exe $(INSTALL_DIR)\bin
-               if not exist $(INSTALL_DIR)\same-dir.tst nmake -f $(MAKE) real_install
-               - del /q ..\same-dir.tst
-               - del /q $(INSTALL_DIR)\same-dir.tst
+               - $(CP) $(BLD)\addpm.exe $(INSTALL_DIR)\bin
+               - $(CP) $(BLD)\runemacs.exe $(INSTALL_DIR)\bin
+               - $(DEL) ..\same-dir.tst
+               - $(DEL) $(INSTALL_DIR)\same-dir.tst
+               echo SameDirTest > $(INSTALL_DIR)\same-dir.tst
+               if not exist ..\same-dir.tst $(CP) ..\bin\emacs.exe $(INSTALL_DIR)\bin
+               if not exist ..\same-dir.tst $(CP) ..\bin\etags.exe $(INSTALL_DIR)\bin
+               if not exist ..\same-dir.tst $(CP) ..\bin\ctags.exe $(INSTALL_DIR)\bin
+               if not exist ..\same-dir.tst nmake -f $(MAKE) real_install
+               - $(DEL) ..\same-dir.tst
+               - $(DEL) $(INSTALL_DIR)\same-dir.tst
 
 real_install:
-               - del /q ..\same-dir.tst
-               - del /q $(INSTALL_DIR)\same-dir.tst
-               echo SameDirTest > ..\same-dir.tst
+               - $(DEL) ..\same-dir.tst
+               - $(DEL) $(INSTALL_DIR)\same-dir.tst
+               echo SameDirTest > $(INSTALL_DIR)\same-dir.tst
                - mkdir $(INSTALL_DIR)\etc
                - mkdir $(INSTALL_DIR)\info
                - mkdir $(INSTALL_DIR)\lock
                - mkdir $(INSTALL_DIR)\data
-               if not exist $(INSTALL_DIR)\nt\same-dir.tst $(CP_DIR) ..\etc $(INSTALL_DIR)\etc
-               if not exist $(INSTALL_DIR)\nt\same-dir.tst $(CP_DIR) ..\info $(INSTALL_DIR)\info
-               - del /q ..\same-dir.tst
-               - del /q $(INSTALL_DIR)\same-dir.tst
+               - mkdir $(INSTALL_DIR)\site-lisp
+               if not exist ..\same-dir.tst $(CP_DIR) ..\etc $(INSTALL_DIR)\etc
+               if not exist ..\same-dir.tst $(CP_DIR) ..\info $(INSTALL_DIR)\info
+               - $(DEL) ..\same-dir.tst
+               - $(DEL) $(INSTALL_DIR)\same-dir.tst
 
 #
 # Maintenance
 # 
 CLEAN_CMD      = $(MAKE) -f makefile.nt clean
-clean:;                - del /q /s *~
+clean:;                - $(DEL) *~ *.pdb
                - $(DEL_TREE) deleted
-               - $(DEL_TREE) obj
+               - $(DEL_TREE) $(OBJDIR)
                - $(DEL_TREE) ..\bin
+               - $(DEL) ..\etc\DOC ..\etc\DOC-X
+               - $(DEL) emacs.bat
                cd ..\lib-src
                $(CLEAN_CMD)
                cd ..\src
Unnamed repository; edit this file 'description' to name the repository.