From: Tony v. d. H. <to...@us...> - 2005-03-13 13:44:31
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/OSLibSupport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31250/!OsLib/OSLibSupport Modified Files: GNUmakefile GNUmakefile.source Log Message: makefile tweaking to only test changed headers Index: GNUmakefile =================================================================== RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/OSLibSupport/GNUmakefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GNUmakefile 3 Aug 2004 10:59:09 -0000 1.3 --- GNUmakefile 13 Mar 2005 13:44:07 -0000 1.4 *************** *** 10,14 **** SOURCES = Choices_ Err_ Events_ Message_ Task_ trace_ X_ ! LIBS = OSLibSupport.o OSLibSupport32.o FILES = $(addsuffix /Modules, ${SOURCES} ) --- 10,15 ---- SOURCES = Choices_ Err_ Events_ Message_ Task_ trace_ X_ ! #LIBS = OSLibSupport.o OSLibSupport32.o ! LIBS = OSLibSupport32.o FILES = $(addsuffix /Modules, ${SOURCES} ) *************** *** 33,39 **** all: ${LIBS} ! OSLibSupport.o: ${SOURCES} ! @if [ ! -a $@ ]; then ${LIBFILE} -c $@; fi; ! ${LIBFILE} -i $@ ${GNUMODULES} OSLibSupport32.o: ${SOURCES} --- 34,41 ---- all: ${LIBS} ! # we no longer biild the 26 bit library, as GCCSDK won't support it ! #OSLibSupport.o: ${SOURCES} ! # @if [ ! -a $@ ]; then ${LIBFILE} -c $@; fi; ! # ${LIBFILE} -i $@ ${GNUMODULES} OSLibSupport32.o: ${SOURCES} *************** *** 41,51 **** ${LIBFILE} -i $@ ${GNUMODULES32} ! Choices_: ;${MAKE} -C $@ ! Err_: ;${MAKE} -C $@ ! Events_: ;${MAKE} -C $@ ! Message_: ;${MAKE} -C $@ ! Task_: ;${MAKE} -C $@ ! trace_: ;${MAKE} -C $@ ! X_: ;${MAKE} -C $@ clean: ;$(foreach dir, ${SOURCES}, ${MAKE} -C ${dir} clean; ) --- 43,55 ---- ${LIBFILE} -i $@ ${GNUMODULES32} ! #Choices_: ;${MAKE} -C $@ ! #Err_: ;${MAKE} -C $@ ! #Events_: ;${MAKE} -C $@ ! #Message_: ;${MAKE} -C $@ ! #Task_: ;${MAKE} -C $@ ! #trace_: ;${MAKE} -C $@ ! #X_: ;${MAKE} -C $@ ! ! ${SOURCES}: ;${MAKE} -C $@ clean: ;$(foreach dir, ${SOURCES}, ${MAKE} -C ${dir} clean; ) *************** *** 66,67 **** --- 70,82 ---- $(foreach file, ${LIBS}, ${CP} ${file} \ ${RELEASEDIR}/o/$(basename ${file});) + + release_unix: ${LIBS} + ifndef RELEASEDIR + error RELEASEDIR not defined + endif + @if [ ! -d ${RELEASEDIR} ]; then mkdir -p ${RELEASEDIR}; fi + ${CP} SetVars,feb ${RELEASEDIR}/ + @if [ ! -d ${RELEASEDIR}/Doc ]; then mkdir -p ${RELEASEDIR}/Doc; fi + ${CP} Doc/X ${RELEASEDIR}/Doc/X + $(foreach file, ${HEADERS}, ${CP} ${file}.h ${RELEASEDIR};) + $(foreach file, ${LIBS}, ${CP} ${file} ${RELEASEDIR};) Index: GNUmakefile.source =================================================================== RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/OSLibSupport/GNUmakefile.source,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GNUmakefile.source 3 May 2004 15:03:22 -0000 1.2 --- GNUmakefile.source 13 Mar 2005 13:44:07 -0000 1.3 *************** *** 22,31 **** #------------------------------------------------------ # targets ! OBJS = $(addsuffix .o,${TARGET}) OBJS32 = $(addsuffix .o32,${TARGET}) .PHONY: all clean ! all: ${OBJS} ${OBJS32} clean: ;-${RM} ${OBJS} ${OBJS32} --- 22,32 ---- #------------------------------------------------------ # targets ! #OBJS = $(addsuffix .o,${TARGET}) OBJS32 = $(addsuffix .o32,${TARGET}) .PHONY: all clean ! #all: ${OBJS} ${OBJS32} ! all: ${OBJS32} clean: ;-${RM} ${OBJS} ${OBJS32} *************** *** 36,43 **** .SUFFIXES: .o .o32 .c ! .c.o: ! ${GCC} -mapcs-26 -o $@ $< ! .c.o32: ${GCC} -o $@ $< --- 37,45 ---- .SUFFIXES: .o .o32 .c ! # GCC no longer supports 26 bit model ! #.c.o: ! # ${GCC} -mapcs-26 -o $@ $< ! %o32 : %c ${GCC} -o $@ $< |