[Tinyos-commits] CVS: tinyos-1.x/tools/make/pxa27x pxa27x.rules, 1.4, 1.5

[Robbie Adler]

Update of /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29044

Modified Files:
	pxa27x.rules 
Log Message:
updated to automatically make pxa27x lib, include compiled objects in image build, create output binary no matter what, and changed default optimization to 03 from Os

Index: pxa27x.rules
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x/pxa27x.rules,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pxa27x.rules	4 Aug 2005 22:27:41 -0000	1.4
--- pxa27x.rules	6 Sep 2005 18:24:34 -0000	1.5
***************
*** 26,31 ****
  ASSEMBLY_FILES += $(PLATFORM_DIR)/barecrt.s $(PLATFORM_DIR)/mmu_table.s $(PLATFORM_DIR)/util.s 
  ASSEMBLY_OBJS =  $(BUILDDIR)/asms.o
  
! OPTFLAGS ?= -Os	
  PFLAGS += -Wall -Wshadow -DDEF_TOS_AM_GROUP=$(DEFAULT_LOCAL_GROUP) $(NESC_FLAGS)
  PFLAGS += -target=$(PLATFORM) -fnesc-cfile=$(BUILDDIR)/app.c -board=$(SENSORBOARD)
--- 26,32 ----
  ASSEMBLY_FILES += $(PLATFORM_DIR)/barecrt.s $(PLATFORM_DIR)/mmu_table.s $(PLATFORM_DIR)/util.s 
  ASSEMBLY_OBJS =  $(BUILDDIR)/asms.o
+ LIBRARY_OBJS  =  $(PLATFORM_DIR)/lib/profile.o $(PLATFORM_DIR)/lib/queue.o
  
! OPTFLAGS ?= -O3 -g
  PFLAGS += -Wall -Wshadow -DDEF_TOS_AM_GROUP=$(DEFAULT_LOCAL_GROUP) $(NESC_FLAGS)
  PFLAGS += -target=$(PLATFORM) -fnesc-cfile=$(BUILDDIR)/app.c -board=$(SENSORBOARD)
***************
*** 45,49 ****
  ifndef BUILD_DEPS
    ifeq ($(filter $(BUILDLESS_DEPS),$(GOALS)),)
!     BUILD_DEPS = bin bytes $(POST_BUILD_EXTRA_DEPS)
    endif
  endif
--- 46,50 ----
  ifndef BUILD_DEPS
    ifeq ($(filter $(BUILDLESS_DEPS),$(GOALS)),)
!     BUILD_DEPS = bin bytes setid $(POST_BUILD_EXTRA_DEPS)
    endif
  endif
***************
*** 58,64 ****
  	@:
  
! exe0: builddir asms $(BUILD_EXTRA_DEPS) FORCE
  	@echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
! 	$(NCC) -o $(MAIN_EXE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS) $(ASSEMBLY_OBJS)
  	@echo "    compiled $(COMPONENT) to $(MAIN_EXE)"
  
--- 59,65 ----
  	@:
  
! exe0: builddir asms library $(BUILD_EXTRA_DEPS) FORCE
  	@echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
! 	$(NCC) -o $(MAIN_EXE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS) $(ASSEMBLY_OBJS) $(LIBRARY_OBJS)
  	@echo "    compiled $(COMPONENT) to $(MAIN_EXE)"
  
***************
*** 72,73 ****
--- 73,76 ----
  	$(GAS) $(ASSEMBLY_FILES) -o $(BUILDDIR)/asms.o -mfpu=softfpa
  
+ library:
+ 	cd $(PLATFORM_DIR)/lib; make;
\ No newline at end of file