From: <jt...@us...> - 2007-06-21 00:30:11
|
Revision: 283 http://ro-oslib.svn.sourceforge.net/ro-oslib/?rev=283&view=rev Author: jtytgat Date: 2007-06-20 17:30:05 -0700 (Wed, 20 Jun 2007) Log Message: ----------- Make sure a 'make clean' cleans all intermediate files except the ones in the Release directory Modified Paths: -------------- branches/simplified-build/!OSLib/Source/Makefile branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_AOF branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_ELF branches/simplified-build/!OSLib/Source/OSLibSupport/Makefile branches/simplified-build/!OSLib/Source/Test/Test/Makefile branches/simplified-build/!OSLib/Source/Test/readvarval/Makefile Modified: branches/simplified-build/!OSLib/Source/Makefile =================================================================== --- branches/simplified-build/!OSLib/Source/Makefile 2007-06-20 23:58:10 UTC (rev 282) +++ branches/simplified-build/!OSLib/Source/Makefile 2007-06-21 00:30:05 UTC (rev 283) @@ -79,6 +79,7 @@ $(MAKE) -C Toolbox/oslib $@ $(MAKE) -C User/oslib $@ -$(RM) $(BUILDDIR) + $(MAKE) -C OSLibSupport $@ $(MAKE) -C Test $@ oslib: $(OSLIBLIB) Modified: branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_AOF =================================================================== --- branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_AOF 2007-06-20 23:58:10 UTC (rev 282) +++ branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_AOF 2007-06-21 00:30:05 UTC (rev 283) @@ -37,6 +37,7 @@ export INSTALL := $(GCCSDK_INSTALL_ENV)/ro-install export ASMEXT := .asm +export EXEEXT := ,ff8 export LIBSUFFIX := o export OSLIBLIB := $(BUILDDIR)/OSLib32.$(LIBSUFFIX) Modified: branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_ELF =================================================================== --- branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_ELF 2007-06-20 23:58:10 UTC (rev 282) +++ branches/simplified-build/!OSLib/Source/Makefile.setup.CROSSGCC_ELF 2007-06-21 00:30:05 UTC (rev 283) @@ -37,6 +37,7 @@ export INSTALL := $(GCCSDK_INSTALL_ENV)/ro-install export ASMEXT := .gas +export EXEEXT := ,e1f export LIBSUFFIX := a export OSLIBLIB := $(BUILDDIR)/libOSLib32.$(LIBSUFFIX) Modified: branches/simplified-build/!OSLib/Source/OSLibSupport/Makefile =================================================================== --- branches/simplified-build/!OSLib/Source/OSLibSupport/Makefile 2007-06-20 23:58:10 UTC (rev 282) +++ branches/simplified-build/!OSLib/Source/OSLibSupport/Makefile 2007-06-21 00:30:05 UTC (rev 283) @@ -1,4 +1,4 @@ -# ... +# Build various support routines for OSLib users. SUBDIRS = Choices_ Err_ Events_ Message_ Task_ trace_ X_ Modified: branches/simplified-build/!OSLib/Source/Test/Test/Makefile =================================================================== --- branches/simplified-build/!OSLib/Source/Test/Test/Makefile 2007-06-20 23:58:10 UTC (rev 282) +++ branches/simplified-build/!OSLib/Source/Test/Test/Makefile 2007-06-21 00:30:05 UTC (rev 283) @@ -1,22 +1,23 @@ -# ... +# Test the inclusion of all C and assembler headers (the former in C and C++ +# programs. ALL_CHEADERS := $(wildcard $(HEADERDIR)/*.h) ALL_ASMHEADERS := $(wildcard $(HEADERDIR)/*.Hdr) .PHONY: all clean -all: test_c test_cpp test_s +all: test_c$(EXEEXT) test_cpp$(EXEEXT) test_s$(EXEEXT) clean: - -$(RM) test_c test_cpp test_s small_test.o all_oslib.h all_oslib.Hdr + -$(RM) test_c,ff8 test_c,e1f test_cpp,ff8 test_cpp,e1f test_s,ff8 test_s,e1f test_s$(EXEEXT).o small_test.o all_oslib.h all_oslib.Hdr -test_c: test.c small_test.o all_oslib.h +test_c$(EXEEXT): test.c small_test.o all_oslib.h $(CC) -o $@ -I$(TOPHEADERDIR) test.c small_test.o $(OSLIBLIB) -test_cpp: test.cc all_oslib.h +test_cpp$(EXEEXT): test.cc all_oslib.h $(CXX) -o $@ -I$(TOPHEADERDIR) $< $(OSLIBLIB) -test_s: test$(ASMEXT) all_oslib.Hdr +test_s$(EXEEXT): test$(ASMEXT) all_oslib.Hdr $(AS) -o $@.o -I$(TOPHEADERDIR) $< $(CC) -o $@ $@.o Modified: branches/simplified-build/!OSLib/Source/Test/readvarval/Makefile =================================================================== --- branches/simplified-build/!OSLib/Source/Test/readvarval/Makefile 2007-06-20 23:58:10 UTC (rev 282) +++ branches/simplified-build/!OSLib/Source/Test/readvarval/Makefile 2007-06-21 00:30:05 UTC (rev 283) @@ -1,13 +1,13 @@ -# ... +# Test os_read_var_val_size interface. .PHONY: all clean -all: readvarval +all: readvarval$(EXEEXT) clean: - -$(RM) readvarval readvarval.o + -$(RM) readvarval,ff8 readvarval,e1f readvarval.o -readvarval: readvarval.o $(OSLIBLIB) +readvarval$(EXEEXT): readvarval.o $(OSLIBLIB) $(CC) -o $@ $^ .SUFFIXES: .o .c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |