(main): Remove code snipped commented out with `//'.

[bpt/emacs.git] / nt / makefile.nt

diff --git a/nt/makefile.nt b/nt/makefile.nt
index ed8bfe6..35fc32f 100644 (file)
--- a/nt/makefile.nt
+++ b/nt/makefile.nt
@@ -22,21 +22,13 @@
 #                                                9-6-94
 !include makefile.def
 
-ALL            = $(BLD)\addpm.exe $(BLD)\ddeclient.exe $(BLD)\runemacs.exe $(BLD)\cmdproxy.exe
+ALL            = addpm ddeclient runemacs cmdproxy addsection preprep
 !if $(MSVCNT11)
 TRES           = $(BLD)\emacs.res
 !else
 TRES           = $(BLD)\emacs.rbj
 !endif
 
-!IF ($(_NMAKE_VER) == $(_NMAKE_VER_4))
-.c{$(BLD)}.obj:
-               $(CC) $(CFLAGS) -Fo$(OBJDIR)\i386\ $<
-!ELSE
-.c{$(BLD)}.obj::
-               $(CC) $(CFLAGS) -Fo$(OBJDIR)\i386\ $<
-!ENDIF
-
 addpm:           $(BLD) $(BLD)\addpm.exe
 $(BLD)\addpm.obj: addpm.c
 $(BLD)\addpm.exe: $(BLD)\addpm.obj
@@ -55,6 +47,18 @@ $(BLD)\cmdproxy.exe: $(BLD)\cmdproxy.obj
                  $(LINK) -out:$@ -subsystem:console -entry:mainCRTStartup \
                  $(SYS_LDFLAGS) $** $(BASE_LIBS) user32.lib
 
+addsection:      $(BLD) $(BLD)\addsection.exe
+$(BLD)\addsection.obj: addsection.c
+$(BLD)\addsection.exe: $(BLD)\addsection.obj
+                 $(LINK) -debug:full -out:$@ -subsystem:console -entry:mainCRTStartup \
+                 $(SYS_LDFLAGS) $** $(BASE_LIBS) user32.lib
+
+preprep:         $(BLD) $(BLD)\preprep.exe
+$(BLD)\preprep.obj: preprep.c
+$(BLD)\preprep.exe: $(BLD)\preprep.obj
+                 $(LINK) -debug:full -out:$@ -subsystem:console -entry:mainCRTStartup \
+                 $(SYS_LDFLAGS) $** $(BASE_LIBS)
+
 #
 # 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.
@@ -86,8 +90,13 @@ all:         $(BLD) $(ALL)
                $(BUILD_CMD)
                cd ..\lisp
                $(BUILD_CMD)
+               cd ..\leim
+               if exist makefile.nt $(BUILD_CMD)
                cd ..\nt
 
+$(INSTALL_DIR):
+               - mkdir $(INSTALL_DIR)
+
 $(INSTALL_DIR)\bin:
                - mkdir $(INSTALL_DIR)\bin
 
@@ -103,7 +112,8 @@ $(INSTALL_DIR)\bin\debug.bat:       debug.bat.in
                echo set emacs_dir=$(INSTALL_DIR)>> $@
                type debug.bat.in >> $@
 
-batch_files: $(INSTALL_DIR)\bin \
+batch_files: $(INSTALL_DIR) \
+            $(INSTALL_DIR)\bin \
             $(INSTALL_DIR)\bin\emacs.bat \
             $(INSTALL_DIR)\bin\debug.bat
 
@@ -111,22 +121,26 @@ batch_files: $(INSTALL_DIR)\bin \
 # Build and install emacs in INSTALL_DIR
 #
 INSTALL_CMD    = $(MAKE) -f makefile.nt install
-install:       all batch_files
-               - mkdir $(INSTALL_DIR)
+install:       all $(INSTALL_DIR) batch_files
                cd ..\lib-src
                $(INSTALL_CMD)
                cd ..\src
                $(INSTALL_CMD)
                cd ..\lisp
                $(INSTALL_CMD)
+               cd ..\leim
+               if exist makefile.nt $(INSTALL_CMD)
                cd ..\nt                
                - $(CP) $(BLD)\addpm.exe $(INSTALL_DIR)\bin
                - $(CP) $(BLD)\ddeclient.exe $(INSTALL_DIR)\bin
                - $(CP) $(BLD)\cmdproxy.exe $(INSTALL_DIR)\bin
                - $(CP) $(BLD)\runemacs.exe $(INSTALL_DIR)\bin
+               - $(CP) ..\lib-src\fns-*.el $(INSTALL_DIR)\bin
                - $(ADDPM) $(INSTALL_DIR)
                - $(DEL) ..\same-dir.tst
                - $(DEL) $(INSTALL_DIR)\same-dir.tst
+               - mkdir $(INSTALL_DIR)\etc\icons
+               - $(CP_DIR) icons $(INSTALL_DIR)\etc\icons
                echo SameDirTest > $(INSTALL_DIR)\same-dir.tst
                if not exist ..\same-dir.tst $(MAKE) -f makefile.nt real_install
                - $(DEL) ..\same-dir.tst
@@ -141,14 +155,17 @@ fast_install:     batch_files
                $(CP) ..\lib-src\DOC $(INSTALL_DIR)\etc
                - mkdir $(INSTALL_DIR)\bin
                - $(CP) $(BLD)\addpm.exe $(INSTALL_DIR)\bin
+               - $(CP) $(BLD)\ddeclient.exe $(INSTALL_DIR)\bin
+               - $(CP) $(BLD)\cmdproxy.exe $(INSTALL_DIR)\bin
                - $(CP) $(BLD)\runemacs.exe $(INSTALL_DIR)\bin
+               - $(CP) ..\lib-src\fns-*.el $(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
+               if not exist ..\same-dir.tst $(MAKE) -f makefile.nt real_install
                - $(DEL) ..\same-dir.tst
                - $(DEL) $(INSTALL_DIR)\same-dir.tst
 
@@ -161,6 +178,8 @@ real_install:
                - mkdir $(INSTALL_DIR)\lock
                - mkdir $(INSTALL_DIR)\data
                - mkdir $(INSTALL_DIR)\site-lisp
+               - mkdir $(INSTALL_DIR)\etc\icons
+               - $(CP_DIR) icons $(INSTALL_DIR)\etc\icons
                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
@@ -187,4 +206,6 @@ clean:;             - $(DEL) *~ *.pdb
                $(CLEAN_CMD)
                cd ..\lisp
                $(CLEAN_CMD)
+               cd ..\leim
+               if exist makefile.nt $(CLEAN_CMD)
                cd ..\nt