Changeset c2a4686 in network-demos for http/Makefile


Ignore:
Timestamp:
Jun 22, 2007, 7:54:58 PM (12 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, master, network-demos-4-10-branch, network-demos-4-8-branch, network-demos-4-9-branch
Children:
07e6684
Parents:
5e49d0d
Message:

2007-06-22 Joel Sherrill <joel.sherrill@…>

  • Makefile, init.c: Clean up. Make name of TARFILE related symbols conditional based upon architecture. Change way desired object format is determined so all BSPs compile this test.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • http/Makefile

    r5e49d0d rc2a4686  
    4343LD_LIBS   += -lhttpd
    4444LD_LIBS   += -lftpd
    45 NATIVE_OBJ = $(shell $(OBJCOPY) 2>&1  | grep copy: | cut -d':' -f3 | cut -d' ' -f2)
     45#NATIVE_OBJ = $(shell $(OBJCOPY) 2>&1  | grep copy: | cut -d':' -f3 | cut -d' ' -f2)
     46OBJDUMP=$(OBJCOPY:copy=dump)
    4647
    4748#
     
    5253#
    5354
    54 CLEAN_ADDITIONS += tarfile
     55CLEAN_ADDITIONS += tarfile obj_format
    5556CLOBBER_ADDITIONS +=
    5657
    5758all:    ${ARCH} $(SRCS) $(PGM)
    5859
    59 ${PGM}: $(OBJS) $(LINK_FILES)
     60obj_format:
     61        $(OBJDUMP) -f $(ARCH)/init.o | grep .o: | \
     62            sed -e 's/^.*format //' >obj_format
     63
     64${PGM}: $(OBJS) obj_format $(LINK_FILES)
    6065        cd rootfs ; tar cf ../$(ARCH)/tarfile web etc
    6166        cp $(ARCH)/tarfile .
    62         $(OBJCOPY) -I binary -O $(NATIVE_OBJ) tarfile $(ARCH)/tarfile.o
    63         $(LD) -r -o $(ARCH)/temp.o  $(ARCH)/init.o $(ARCH)/tarfile.o
     67        $(OBJCOPY) -I binary -O `cat obj_format` tarfile $(ARCH)/tarfile.o
     68        $(LD) $(CPU_CFLAGS) -r -o $(ARCH)/temp.o \
     69            $(ARCH)/init.o $(ARCH)/tarfile.o
    6470        $(MV) $(ARCH)/temp.o  $(ARCH)/init.o
    6571        $(RM) $(ARCH)/temp.o
Note: See TracChangeset for help on using the changeset viewer.