[Husky-cvs]hpucode/make makefile.mvcdll,1.5,1.6 makefile.mvc,1.3,1.4

[<and...@us...>]

Update of /cvsroot/husky/hpucode/make
In directory sc8-pr-cvs1:/tmp/cvs-serv13933

Modified Files:
	makefile.mvcdll makefile.mvc 
Log Message:
Fix MSVC compilation

Index: makefile.mvcdll
===================================================================
RCS file: /cvsroot/husky/hpucode/make/makefile.mvcdll,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- makefile.mvcdll	20 Oct 2003 06:18:30 -0000	1.5
+++ makefile.mvcdll	21 Oct 2003 05:22:02 -0000	1.6
@@ -8,7 +8,6 @@
 include makefile.inc
 
 ## programs ##
-
 CC	= cl
 AR	= lib
 LINK	= link
@@ -16,43 +15,44 @@
 RM	= del
 
 ## file suffixes ##
-_C	= .c
-_OBJ	= .obj
-_LIB	= .lib
-_EXE	= .exe
-_DLL	= .dll
-_EXP	= .exp
-_ILK	= .ilk
-_PDB	= .pdb
+_C	  = .c
+_OBJ	  = .obj
+_EXP	  = .exp
+_LIB	  = .lib
+_DLL	  = .dll 
+_EXE	  = .exe
 
-## program options ##
-CFLAGS=-nologo -MD -Zp1 -Ob2 -c
-CINCL= -I$(H_DIR) -I..\..\fidoconf -I..\..\smapi -I..\..\huskylib
-LFLAGS=
-CDEFS =-D__NT__ -D_CONSOLE -D_MAKE_DLL
-EXENAMEFLAG=-Fe
+## programs ##
+CFLAGS	= -nologo -MD -Zp1
+CINCL	= -I$(H_DIR) -I..\..\fidoconf -I..\..\smapi -I..\..\huskylib
+CDEFS	= -D__NT__ -DNT -DWINNT -DWIN32 -D_CONSOLE
+COPT	= -Ob2
 
-# List of HUSKY libraries required to build binary file(s)
-LIBS	= ..\..\huskylib\make\huskymvc.lib \
-	  ..\..\smapi\make\smapimvc.lib ..\..\fidoconf\make\fconfmvc.lib \
-	  USER32.LIB msvcrt.lib Kernel32.lib \
-	  /link /nodefaultlib /opt:nowin98
+EXEFLAGS= /link /opt:nowin98
+EXENAMEFLAG = -Fe
 
-default: all
-programs: $(PROGRAMS)
-all: programs
+LIBS	= ..\..\fidoconf\make\fconfmvc.lib ..\..\smapi\make\smapimvc.lib \
+	  ..\..\huskylib\make\huskymvc.lib \
+	  USER32.LIB msvcrt.lib Kernel32.lib
 
-{$(_SRC_DIR)}.c$(_OBJ):
-	@$(CC) $(CFLAGS) $(CINCL) $(CDEFS) $<
+default:
+	@echo Run 'make programs' to build dinamic version of programs ($(PROGRAMS))
+	@echo Run 'make all' to build all above
 
+all: programs
+programs: $(PROGRAMS)
+
+{$(_SRC_DIR)}$(_C)$(_OBJ):
+	@$(CC) $(CFLAGS) $(CINCL) $(CDEFS) $(COPT) -c $<
 
 $(PROGRAMS): $(OBJS)
-	$(CC) $(LFLAGS) $(EXENAMEFLAG)$@ $** $(LIBS)
+	@echo Create $(PROGRAMS)...
+	@$(CC) $(CFLAGS) $(CINCL) $(COPT) $(CDEFS) $(EXENAMEFLAG)$@ $**  $(LIBS) $(EXEFLAGS)
 
 man:
 
 doc: man
-	man2html$(EXE) <..\$(LIBNAME).1 >$(LIBNAME).html
+	man2html$(_EXE) <..\$(LIBNAME).1 >$(LIBNAME).html
 
 clean:
 	-$(RM) $(RMOPT) *$(_OBJ)
@@ -64,7 +64,7 @@
 install: programs doc
 	$(INSTALL) $(IBOPT) $(PROGRAMS) $(BINDIR)
 	$(INSTALL) $(IBOPT) ..\$(LIBNAME).1 $(DOCDIR)
-	$(INSTALL) $(IBOPT) $(EXENAME).html $(DOCDIR)
+	$(INSTALL) $(IBOPT) $(LIBNAME).html $(DOCDIR)
 
 uninstall:
 	-$(RM) $(RMOPT) $(BINDIR)\$(PROGRAMS)

Index: makefile.mvc
===================================================================
RCS file: /cvsroot/husky/hpucode/make/makefile.mvc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- makefile.mvc	8 Apr 2003 08:03:43 -0000	1.3
+++ makefile.mvc	21 Oct 2003 05:22:02 -0000	1.4
@@ -1,30 +1,69 @@
 # $Id$
 #
-# Microsoft Visual C++ Makefile
+# Microsoft Visual C++ Makefile for build static program(s)
+# No support for the Husky build environment.
+#
+# Tested on MS Visual C 6.0
+#
+include makefile.inc
 
+## programs ##
 CC	= cl
+AR	= lib
+LINK	= link
+RANLIB	=
+RM	= del
+
+## file suffixes ##
+_C	  = .c
+_OBJ	  = .obj
+_EXP	  = .exp
+_LIB	  = .lib
+_DLL	  = .dll 
+_EXE	  = .exe
+
+## programs ##
 CFLAGS	= -nologo -Zp1
-CINCL	= -I..\h -I..\..\fidoconf -I..\..\smapi -I..\..\huskylib
-CDEFS=  -D__NT__ -DNT -DWINNT -D_CONSOLE
-COPT=   -O2
+CINCL	= -I$(H_DIR) -I..\..\fidoconf -I..\..\smapi -I..\..\huskylib
+CDEFS	= -D__NT__ -DNT -DWINNT -DWIN32 -D_CONSOLE
+COPT	= -Ob2
 
-SRC_DIR	= ..\src
+EXENAMEFLAG = -Fe
 
-LIBS	= ..\..\huskylib\make\huskymvc.lib \
-	  ..\..\smapi\make\smapimvc.lib ..\..\fidoconf\fconfmvc.lib
+LIBS	= ..\..\fidoconf\make\fconfmvc.lib ..\..\smapi\make\smapimvc.lib \
+	  ..\..\huskylib\make\huskymvc.lib
 
-all: hpucode.exe
+default:
+	@echo Run 'make programs' to build static version of programs ($(PROGRAMS))
+	@echo Run 'make all' to build all above
 
-hpucode.exe:
-        $(CC) $(CFLAGS) $(CINCL) $(CDEFS) $(COPT) -Fe$@ \
-	$(SRC_DIR)\uuecode.c \
-	$(SRC_DIR)\uuefile.c \
-	$(SRC_DIR)\scanmsg.c \
-	$(SRC_DIR)\dupe.c    \
-	$(LIBS)  
+all: programs
+programs: $(PROGRAMS)
+
+{$(_SRC_DIR)}$(_C)$(_OBJ):
+	@$(CC) $(CFLAGS) $(CINCL) $(CDEFS) $(COPT) -c $<
+
+$(PROGRAMS): $(OBJS)
+	@echo Create $(PROGRAMS)...
+	@$(CC) $(CFLAGS) $(CINCL) $(COPT) $(CDEFS) $(EXENAMEFLAG)$@ $** $(LIBS)
+
+man:
+
+doc: man
+	man2html$(_EXE) <..\$(LIBNAME).1 >$(LIBNAME).html
 
 clean:
-	-del *.obj
+	-$(RM) $(RMOPT) *$(_OBJ)
 
 distclean: clean
-	-del *.exe
+	-$(RM) $(RMOPT) $(PROGRAMS)
+	-$(RM) $(RMOPT) $(LIBNAME).html
+
+install: programs doc
+	$(INSTALL) $(IBOPT) $(PROGRAMS) $(BINDIR)
+	$(INSTALL) $(IBOPT) ..\$(LIBNAME).1 $(DOCDIR)
+	$(INSTALL) $(IBOPT) $(LIBNAME).html $(DOCDIR)
+
+uninstall:
+	-$(RM) $(RMOPT) $(BINDIR)\$(PROGRAMS)
+	-$(RM) $(RMOPT) $(DOCDIR)\$(LIBNAME).html