[ro-oslib-commits] OSLib/!OsLib/Source/Test/Test1 .cvsignore,1.1,1.2 GNUmakefile,1.2,1.3

[Tony v. d. H. <to...@us...>]

Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Test/Test1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31250/!OsLib/Source/Test/Test1

Modified Files:
	.cvsignore GNUmakefile 
Log Message:
makefile tweaking to only test changed headers

Index: .cvsignore
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Test/Test1/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore	4 May 2004 13:38:56 -0000	1.1
--- .cvsignore	13 Mar 2005 13:44:08 -0000	1.2
***************
*** 1,2 ****
--- 1,3 ----
  include.h
  include.Hdr
+ *.o

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Test/Test1/GNUmakefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GNUmakefile	7 Mar 2005 16:48:26 -0000	1.2
--- GNUmakefile	13 Mar 2005 13:44:08 -0000	1.3
***************
*** 11,25 ****
  #------------------------------------------------------------------------
  #target-specific macros
! SOURCES_0 	= Computer Core Toolbox User
! SOURCES		= ${SOURCES_0} Types Macros
! CONTENTS	= $(addsuffix /oslib/Modules, $(addprefix ${SOURCEDIR}/, ${SOURCES_0}) )
! OSLIB		= ${SOURCEDIR}/OSLib.o
! OSLIB32		= ${SOURCEDIR}/OSLib32.o
! OSLIB_H		= oslib.h
! OSLIB_HH	= OSLib.Hdr
  
! INCLUDES	= $(addprefix -I${SOURCEDIR}/, ${SOURCES} )
  
! ASOPTIONS	= $(shell echo -objasm -apcs32 $(addprefix -I${SOURCEDIR}/, ${SOURCES} ) | \
  			sed 's/ /,/g' )
  
--- 11,25 ----
  #------------------------------------------------------------------------
  #target-specific macros
! SOURCES_0 	:= Computer Core Toolbox User
! SOURCES		:= ${SOURCES_0} Types Macros
! CONTENTS	:= $(addsuffix /oslib/Modules, $(addprefix ${SOURCEDIR}/, ${SOURCES_0}) )
! OSLIB		:= ${SOURCEDIR}/OSLib.o
! OSLIB32		:= ${SOURCEDIR}/OSLib32.o
! OSLIB_H		:= oslib.h
! OSLIB_HH	:= OSLib.Hdr
  
! INCLUDES	:= $(addprefix -I${SOURCEDIR}/, ${SOURCES} )
  
! ASOPTIONS	:= $(shell echo -objasm -apcs32 $(addprefix -I${SOURCEDIR}/, ${SOURCES} ) | \
  			sed 's/ /,/g' )
  
***************
*** 37,40 ****
--- 37,42 ----
  include ${CONTENTS}
  
+ VPATH		:= $(addsuffix /oslib/, $(addprefix ${SOURCEDIR}/, ${SOURCES_0}) )
+ 
  #------------------------------------------------------------------------
  # Targets:
***************
*** 45,51 ****
  TEST_S		= test.s
  
! OBJS		= $(addsuffix .o, ${SWIMODULES})
! OBJ_C		= $(addprefix c_, $(call tolower, ${OBJS}))
! OBJ_S		= $(addprefix s_, ${OBJS})
  
  all:		${OBJ_C} ${OBJ_S}
--- 47,53 ----
  TEST_S		= test.s
  
! OBJS		:= $(addsuffix .o, ${SWIMODULES} ${MODULES})
! OBJ_C		:= $(addprefix c_, $(call tolower, ${OBJS}))
! OBJ_S		:= $(addprefix s_, ${OBJS})
  
  all:		${OBJ_C} ${OBJ_S}
***************
*** 53,63 ****
  test_s:		${OBJ_S}
  
! c_%.o:	;@echo "Testing $(subst .o,.h,$(subst c_,,$@))"
  	@echo "#include \"oslib/$(subst .o,.h,$(subst c_,,$@))\"" >> include.h
  	@${GCC} -c ${TEST_C} ${INCLUDES} -o /dev/null
  
! s_%.o:	;@echo "Testing $(subst .o,.Hdr,$(subst s_,,$@))"
  	@echo "       GET        oslib/$(subst .o,.Hdr,$(subst s_,,$@))" >> include.Hdr
  	@${AS} -c ${TEST_S} -o /dev/null
  
! clean:	;-${RM} include.h include.Hdr
--- 55,69 ----
  test_s:		${OBJ_S}
  
! c_%.o:	%.h
! 	@echo "Testing $(subst .o,.h,$(subst c_,,$@))"
  	@echo "#include \"oslib/$(subst .o,.h,$(subst c_,,$@))\"" >> include.h
  	@${GCC} -c ${TEST_C} ${INCLUDES} -o /dev/null
+ 	@touch $@
  
! s_%.o:	%.Hdr
! 	@echo "Testing $(subst .o,.Hdr,$(subst s_,,$@))"
  	@echo "       GET        oslib/$(subst .o,.Hdr,$(subst s_,,$@))" >> include.Hdr
  	@${AS} -c ${TEST_S} -o /dev/null
+ 	@touch $@
  
! clean:	;-${RM} include.h include.Hdr c_*.o s_*.o