Changeset c2a4686 in network-demos for http/Makefile

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:

• http/Makefile (modified) (2 diffs)

http/Makefile

@@ -43 +43 @@
 LD_LIBS   += -lhttpd
 LD_LIBS   += -lftpd
-NATIVE_OBJ = $(shell $(OBJCOPY) 2>&1  | grep copy: | cut -d':' -f3 | cut -d' ' -f2)
+#NATIVE_OBJ = $(shell $(OBJCOPY) 2>&1  | grep copy: | cut -d':' -f3 | cut -d' ' -f2)
+OBJDUMP=$(OBJCOPY:copy=dump)
 
 #
@@ -52 +53 @@
 #
 
-CLEAN_ADDITIONS += tarfile
+CLEAN_ADDITIONS += tarfile obj_format
 CLOBBER_ADDITIONS +=
 
 all:    ${ARCH} $(SRCS) $(PGM)
 
-${PGM}: $(OBJS) $(LINK_FILES)
+obj_format:
+        $(OBJDUMP) -f $(ARCH)/init.o | grep .o: | \
+            sed -e 's/^.*format //' >obj_format
+
+${PGM}: $(OBJS) obj_format $(LINK_FILES)
         cd rootfs ; tar cf ../$(ARCH)/tarfile web etc
         cp $(ARCH)/tarfile .
-        $(OBJCOPY) -I binary -O $(NATIVE_OBJ) tarfile $(ARCH)/tarfile.o
-        $(LD) -r -o $(ARCH)/temp.o  $(ARCH)/init.o $(ARCH)/tarfile.o
+        $(OBJCOPY) -I binary -O `cat obj_format` tarfile $(ARCH)/tarfile.o
+        $(LD) $(CPU_CFLAGS) -r -o $(ARCH)/temp.o \
+            $(ARCH)/init.o $(ARCH)/tarfile.o
         $(MV) $(ARCH)/temp.o  $(ARCH)/init.o
         $(RM) $(ARCH)/temp.o