diff options
Diffstat (limited to 'NetWare/Makefile')
| -rw-r--r-- | NetWare/Makefile | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/NetWare/Makefile b/NetWare/Makefile index bb40515f70..f563cd1fdd 100644 --- a/NetWare/Makefile +++ b/NetWare/Makefile @@ -33,7 +33,6 @@ REL_DIR = Release DEB_DIR = Debug -!ifndef MAKE_TYPE !ifndef NLMSDKBASE !message "Run bat\SetNWBld.bat to set the NetWare SDK before continuing.\n" !error @@ -115,17 +114,17 @@ BLDMESG = Debug version, BS_CFLAGS = -opt off -inline off -sym on -sym codeview4 -sym internal -DDEBUGGING -DDKFBPON BLDMESG = $(BLDMESG) Using /d2 option !ifdef NLM_NAME8 -LDFLAGS = $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(NLM_NAME8).sym +LDFLAGS = $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(MAKE_TYPE)\$(NLM_NAME8).sym !else # !ifdef NLM_NAME8 -LDFLAGS = $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(NLM_NAME).sym +LDFLAGS = $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(MAKE_TYPE)\$(NLM_NAME).sym !endif # !ifdef NLM_NAME8 !else # !ifdef USE_D2 BS_CFLAGS = -opt off -inline off -sym on -sym codeview4 -sym internal -DDEBUGGING -DDKFBPON BLDMESG = $(BLDMESG) Using /d1 option !ifdef NLM_NAME8 -LDFLAGS = $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(NLM_NAME8).sym +LDFLAGS = $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(MAKE_TYPE)\$(NLM_NAME8).sym !else # !ifdef NLM_NAME8 -LDFLAGS = $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(NLM_NAME).sym +LDFLAGS = $(LDFLAGS) -sym on -sym codeview4 -sym internal -osym $(MAKE_TYPE)\$(NLM_NAME).sym !endif # !ifdef NLM_NAME8 !endif # !ifdef USE_D2 !else # !if "$(MAKE_TYPE)"=="Debug" @@ -927,7 +926,7 @@ $(MINIMOD) : $(MINIPERL) ..\minimod.pl @echo $(MPKMESSAGE)...$(BLDMESG)...$@ $(C_COMPILER) $(COMPLER_FLAGS) $(NLM_INCLUDES) -I..\x2p $(ADD_LOCDEFS) $(ERROR_FLAG) $*.c -o $@ @echo Built $(@) - + ..\x2p\hash$(o) : ..\x2p\hash.c @echo $(MPKMESSAGE)...$(BLDMESG)...$@ $(C_COMPILER) $(COMPLER_FLAGS) $(NLM_INCLUDES) -I..\x2p $(ADD_LOCDEFS) $(ERROR_FLAG) $*.c -o $@ @@ -1072,14 +1071,6 @@ $(NLM_NAME): MESSAGE HEADERS $(BLDDIR)\nul $(NLM_OBJ) $(NEWTARE_OBJ_DEP) $(NEWTA $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR) @echo ========Linked $@ ========== -!if "$(MAKE_TYPE)"=="Debug" -!ifdef NLM_NAME8 - .\bat\cvpack $(BLDDIR)\$(NLM_NAME8).sym -!else - .\bat\cvpack $(BLDDIR)\$(NLM_NAME).sym -!endif -!endif - @echo======= Finished building $(BUILT). # Create the debug or release directory if not existing @@ -1396,11 +1387,11 @@ nwclean: @if exist .\config.h del /f /q .\config.h @if exist .\config.nw5 del /f /q .\config.nw5 @if exist .\perl.imp del /f /q .\perl.imp - -del /f /q *.obj *.lib *.def *.sym *.map *.xdc *.err + -del /f /q *.obj *.lib *.def *.sym *.map *.xdc *.err *.nlm cd testnlm\echo - -del /f /q *.obj *.map *.link *.options *.nlm *.sym *.xdc *.err + -del /f /q *.obj *.map *.link *.options *.nlm *.sym *.xdc *.err *.lib *.def *.pdb *.bs cd ..\type - -del /f /q *.obj *.map *.link *.options *.nlm *.sym *.xdc *.err + -del /f /q *.obj *.map *.link *.options *.nlm *.sym *.xdc *.err *.lib *.def *.pdb *.bs cd ..\..\ utils: $(BLDDIR)\$(NLM_NAME8).$(NLM_EXT) $(X2P) @@ -1457,14 +1448,14 @@ distclean: clean nwclean -del /f /q $(CONFIGPM) -del /f /q bin\*.bat cd $(EXTDIR) - -del /s /f /q *.lib *.def *.map *.pdb *.bs Makefile *$(o) pm_to_blib *.xdc *.err + -del /s /q /f *.lib *.def *.map *.pdb *.bs Makefile *$(o) pm_to_blib *.xdc *.err *.obj *.sym cd ..\netware !if "$(NW_EXTNS)"=="yes" cd cgi2perl - -del /f /q *.obj *.bs Makefile *$(o) *.c pm_to_blib *.xdc *.err *.sym *.map + -del /f /q *.obj *.bs Makefile *$(o) *.c pm_to_blib *.xdc *.err *.sym *.map *.def *.lib *.pdb cd .. cd $(EXTDIR)\Perl2UCS - -del /f /q *.obj *.bs Makefile *$(o) *.c pm_to_blib *.xdc *.err *.sym *.map *.c + -del /f /q *.obj *.bs Makefile *$(o) *.c pm_to_blib *.xdc *.err *.sym *.map *.def *.lib *.pdb cd ..\..\netware cd $(EXTDIR)\UCSExt -del /f /q *.obj *.bs Makefile *$(o) *.c pm_to_blib *.xdc *.err *.sym *.map *.c |