[Openjade-checkins] CVS: sp/spent Makefile.am,1.7,1.8 spent.dsp,1.2,1.3

[Ian C. <ic...@us...>]

Update of /cvsroot/openjade/sp/spent
In directory usw-pr-cvs1:/tmp/cvs-serv19299/spent

Modified Files:
	Makefile.am spent.dsp 
Log Message:
Merge from opensp_1_5_branch part I. Updated and removed files.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/openjade/sp/spent/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Makefile.am	8 Feb 2000 16:59:31 -0000	1.7
--- Makefile.am	10 May 2002 11:07:31 -0000	1.8
***************
*** 9,15 ****
  INCLUDES = -I$(top_srcdir)/include
  
! EXTRA_DIST = spent.dsp SpentMessages.msg SpentMessages.rc
  
! BUILT_SOURCES = SpentMessages.msg SpentMessages.rc
  
  MSGGENFLAGS = -l appModule
--- 9,18 ----
  INCLUDES = -I$(top_srcdir)/include
  
! EXTRA_DIST = spent.dsp SpentMessages.msg SpentMessages.rc \
! 	.cvsignore
  
! BUILT_SOURCES = SpentMessages.rc SpentMessages.h
! 
! MAINTAINERCLEANFILES = Makefile.in
  
  MSGGENFLAGS = -l appModule

Index: spent.dsp
===================================================================
RCS file: /cvsroot/openjade/sp/spent/spent.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** spent.dsp	8 Feb 2000 16:59:31 -0000	1.2
--- spent.dsp	10 May 2002 11:07:31 -0000	1.3
***************
*** 43,47 ****
  # PROP Target_Dir "."
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
! # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D SP_NAMESPACE=James_Clark_SP /D "SP_MULTI_BYTE" /YX /FD /c
  # ADD BASE RSC /l 0x809 /d "NDEBUG"
  # ADD RSC /l 0x809 /d "NDEBUG"
--- 43,47 ----
  # PROP Target_Dir "."
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
! # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D SP_NAMESPACE=OpenSP /D "SP_MULTI_BYTE" /YX /FD /c
  # ADD BASE RSC /l 0x809 /d "NDEBUG"
  # ADD RSC /l 0x809 /d "NDEBUG"
***************
*** 68,72 ****
  # PROP Target_Dir "."
  # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
! # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D SP_NAMESPACE=James_Clark_SP /D "SP_MULTI_BYTE" /YX /FD /c
  # ADD BASE RSC /l 0x809 /d "_DEBUG"
  # ADD RSC /l 0x809 /d "_DEBUG"
--- 68,72 ----
  # PROP Target_Dir "."
  # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
! # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D SP_NAMESPACE=OpenSP /D "SP_MULTI_BYTE" /YX /FD /c
  # ADD BASE RSC /l 0x809 /d "_DEBUG"
  # ADD RSC /l 0x809 /d "_DEBUG"