diff options
-rw-r--r-- | rbutil/mkamsboot/Makefile | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/rbutil/mkamsboot/Makefile b/rbutil/mkamsboot/Makefile index eca330a6c0..7d794bde46 100644 --- a/rbutil/mkamsboot/Makefile +++ b/rbutil/mkamsboot/Makefile | |||
@@ -28,9 +28,9 @@ endif | |||
28 | 28 | ||
29 | ifdef RBARCH | 29 | ifdef RBARCH |
30 | CFLAGS += -arch $(RBARCH) | 30 | CFLAGS += -arch $(RBARCH) |
31 | OBJDIR = $(RBARCH)/ | ||
31 | endif | 32 | endif |
32 | 33 | ||
33 | OUT = $(TARGET_DIR)build$(RBARCH) | ||
34 | 34 | ||
35 | all: $(OUTPUT) | 35 | all: $(OUTPUT) |
36 | 36 | ||
@@ -43,12 +43,13 @@ $(LIBUCL): | |||
43 | # inputs | 43 | # inputs |
44 | LIBSOURCES := dualboot.c md5.c mkamsboot.c | 44 | LIBSOURCES := dualboot.c md5.c mkamsboot.c |
45 | SOURCES := $(LIBSOURCES) main.c | 45 | SOURCES := $(LIBSOURCES) main.c |
46 | OBJS := $(patsubst %.c,%.o,$(addprefix $(OUT)/,$(SOURCES))) | 46 | OBJS := $(patsubst %.c,%.o,$(addprefix $(OBJDIR),$(SOURCES))) |
47 | LIBOBJS := $(patsubst %.c,%.o,$(addprefix $(OUT)/,$(LIBSOURCES))) | 47 | LIBOBJS := $(patsubst %.c,%.o,$(addprefix $(OBJDIR),$(LIBSOURCES))) |
48 | EXTRADEPS := $(LIBUCL) | 48 | EXTRADEPS := $(LIBUCL) |
49 | 49 | ||
50 | $(OUT)/%.o: %.c $(OUT) | 50 | $(OBJDIR)%.o: %.c |
51 | @echo CC $< $ | 51 | @echo CC $< $ |
52 | $(SILENT)mkdir -p $(dir $@) | ||
52 | $(SILENT)$(CC) $(CFLAGS) -c -o $@ $< | 53 | $(SILENT)$(CC) $(CFLAGS) -c -o $@ $< |
53 | 54 | ||
54 | libmkamsboot$(RBARCH).a: $(LIBOBJS) | 55 | libmkamsboot$(RBARCH).a: $(LIBOBJS) |
@@ -68,22 +69,22 @@ $(TARGET_DIR)libmkamsbooti386.a: | |||
68 | $(TARGET_DIR)libmkamsbootppc.a: | 69 | $(TARGET_DIR)libmkamsbootppc.a: |
69 | make RBARCH=ppc TARGET_DIR=$(TARGET_DIR) libmkamsbootppc.a | 70 | make RBARCH=ppc TARGET_DIR=$(TARGET_DIR) libmkamsbootppc.a |
70 | endif | 71 | endif |
71 | 72 | ||
72 | libmkamsboot-universal: $(TARGET_DIR)libmkamsbooti386.a $(TARGET_DIR)libmkamsbootppc.a | 73 | libmkamsboot-universal: $(TARGET_DIR)libmkamsbooti386.a $(TARGET_DIR)libmkamsbootppc.a |
73 | @echo lipo $(TARGET_DIR)libmkamsboot.a | 74 | @echo lipo $(TARGET_DIR)libmkamsboot.a |
74 | $(SILENT) rm -f $(TARGET_DIR)libmkamsboot.a | 75 | $(SILENT) rm -f $(TARGET_DIR)libmkamsboot.a |
75 | $(SILENT)lipo -create $(TARGET_DIR)libmkamsbootppc.a $(TARGET_DIR)libmkamsbooti386.a -output $(TARGET_DIR)libmkamsboot.a | 76 | $(SILENT)lipo -create $(TARGET_DIR)libmkamsbootppc.a $(TARGET_DIR)libmkamsbooti386.a -output $(TARGET_DIR)libmkamsboot.a |
76 | 77 | ||
77 | clean: | 78 | clean: |
78 | rm -f $(OUTPUT) libmkamsboot.o $(TARGET_DIR)libmkamsboot*.a mkamsboot.dmg | 79 | rm -f $(OBJS) $(OUTPUT) libmkamsboot.o $(TARGET_DIR)libmkamsboot*.a mkamsboot.dmg |
79 | rm -rf build* mkamsboot-* | 80 | rm -rf mkamsboot-* i386 ppc $(OBJDIR) |
80 | 81 | ||
81 | mkamsboot-i386: | 82 | mkamsboot-i386: |
82 | $(MAKE) RBARCH=i386 | 83 | $(MAKE) RBARCH=i386 |
83 | mv mkamsboot mkamsboot-i386 | 84 | mv mkamsboot mkamsboot-i386 |
84 | 85 | ||
85 | mkamsboot-ppc: | 86 | mkamsboot-ppc: |
86 | make RBARCH=ppc | 87 | $(MAKE) RBARCH=ppc |
87 | mv mkamsboot mkamsboot-ppc | 88 | mv mkamsboot mkamsboot-ppc |
88 | 89 | ||
89 | mkamsboot-mac: mkamsboot-i386 mkamsboot-ppc | 90 | mkamsboot-mac: mkamsboot-i386 mkamsboot-ppc |
@@ -93,8 +94,3 @@ mkamsboot.dmg: mkamsboot-mac | |||
93 | mkdir -p mkamsboot-dmg | 94 | mkdir -p mkamsboot-dmg |
94 | cp -p mkamsboot-mac mkamsboot-dmg | 95 | cp -p mkamsboot-mac mkamsboot-dmg |
95 | hdiutil create -srcfolder mkamsboot-dmg mkamsboot.dmg | 96 | hdiutil create -srcfolder mkamsboot-dmg mkamsboot.dmg |
96 | |||
97 | $(OUT): | ||
98 | @echo MKDIR $(OUT) | ||
99 | $(SILENT)mkdir $(OUT) | ||
100 | |||