Simplify the make rules for creating libraries

Martin Storsjö committed 12 years ago

Commit ea8a0021 parent 33fe2b56 files · +12 −12Browse files

Unified · Split

6 files

build/gtest-targets.mk +2 −2
build/mktargets.py +2 −2
codec/common/targets.mk +2 −2
codec/decoder/targets.mk +2 −2
codec/encoder/targets.mk +2 −2
codec/processing/targets.mk +2 −2

build/gtest-targets.mk+2−2

@@ -9,8 +9,8 @@ $(GTEST_SRCDIR)/%.o: $(GTEST_SRCDIR)/%.cc · 8 unmodified lines
9	9	$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(GTEST_CFLAGS) $(GTEST_INCLUDES) -c $(CXX_O) $<
10	10
11	11	$(LIBPREFIX)gtest.$(LIBSUFFIX): $(GTEST_OBJS)
12		− rm -f $(LIBPREFIX)gtest.$(LIBSUFFIX)
13		− $(AR) $(AR_OPTS) $(GTEST_OBJS)
	12	+ rm -f $@
	13	+ $(AR) $(AR_OPTS) $+
14	14
15	15	libraries: $(LIBPREFIX)gtest.$(LIBSUFFIX)
16	16	LIBRARIES += $(LIBPREFIX)gtest.$(LIBSUFFIX)

build/mktargets.py+2−2

@@ -112,8 +112,8 @@ if len(asm) > 0: · 111 unmodified lines
112	112
113	113	if args.library is not None:
114	114	f.write("$(LIBPREFIX)%s.$(LIBSUFFIX): $(%s_OBJS)\n"%(args.library, PREFIX))
115		− f.write("\trm -f $(LIBPREFIX)%s.$(LIBSUFFIX)\n"%args.library)
116		− f.write("\t$(AR) $(AR_OPTS) $(%s_OBJS)\n"%PREFIX)
	115	+ f.write("\trm -f $@\n")
	116	+ f.write("\t$(AR) $(AR_OPTS) $+\n")
117	117	f.write("\n")
118	118	f.write("libraries: $(LIBPREFIX)%s.$(LIBSUFFIX)\n"%args.library)
119	119	f.write("LIBRARIES += $(LIBPREFIX)%s.$(LIBSUFFIX)\n"%args.library)

codec/common/targets.mk+2−2

@@ -30,8 +30,8 @@ $(COMMON_SRCDIR)/%.o: $(COMMON_SRCDIR)/%.asm · 29 unmodified lines
30	30	$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(COMMON_ASMFLAGS) $(COMMON_ASM_INCLUDES) -o $@ $<
31	31
32	32	$(LIBPREFIX)common.$(LIBSUFFIX): $(COMMON_OBJS)
33		− rm -f $(LIBPREFIX)common.$(LIBSUFFIX)
34		− $(AR) $(AR_OPTS) $(COMMON_OBJS)
	33	+ rm -f $@
	34	+ $(AR) $(AR_OPTS) $+
35	35
36	36	libraries: $(LIBPREFIX)common.$(LIBSUFFIX)
37	37	LIBRARIES += $(LIBPREFIX)common.$(LIBSUFFIX)

codec/decoder/targets.mk+2−2

@@ -42,8 +42,8 @@ $(DECODER_SRCDIR)/%.o: $(DECODER_SRCDIR)/%.asm · 41 unmodified lines
42	42	$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(DECODER_ASMFLAGS) $(DECODER_ASM_INCLUDES) -o $@ $<
43	43
44	44	$(LIBPREFIX)decoder.$(LIBSUFFIX): $(DECODER_OBJS)
45		− rm -f $(LIBPREFIX)decoder.$(LIBSUFFIX)
46		− $(AR) $(AR_OPTS) $(DECODER_OBJS)
	45	+ rm -f $@
	46	+ $(AR) $(AR_OPTS) $+
47	47
48	48	libraries: $(LIBPREFIX)decoder.$(LIBSUFFIX)
49	49	LIBRARIES += $(LIBPREFIX)decoder.$(LIBSUFFIX)

codec/encoder/targets.mk+2−2

@@ -56,8 +56,8 @@ $(ENCODER_SRCDIR)/%.o: $(ENCODER_SRCDIR)/%.asm · 55 unmodified lines
56	56	$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(ENCODER_ASMFLAGS) $(ENCODER_ASM_INCLUDES) -o $@ $<
57	57
58	58	$(LIBPREFIX)encoder.$(LIBSUFFIX): $(ENCODER_OBJS)
59		− rm -f $(LIBPREFIX)encoder.$(LIBSUFFIX)
60		− $(AR) $(AR_OPTS) $(ENCODER_OBJS)
	59	+ rm -f $@
	60	+ $(AR) $(AR_OPTS) $+
61	61
62	62	libraries: $(LIBPREFIX)encoder.$(LIBSUFFIX)
63	63	LIBRARIES += $(LIBPREFIX)encoder.$(LIBSUFFIX)

codec/processing/targets.mk+2−2

@@ -39,8 +39,8 @@ $(PROCESSING_SRCDIR)/%.o: $(PROCESSING_SRCDIR)/%.asm · 38 unmodified lines
39	39	$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(PROCESSING_ASMFLAGS) $(PROCESSING_ASM_INCLUDES) -o $@ $<
40	40
41	41	$(LIBPREFIX)processing.$(LIBSUFFIX): $(PROCESSING_OBJS)
42		− rm -f $(LIBPREFIX)processing.$(LIBSUFFIX)
43		− $(AR) $(AR_OPTS) $(PROCESSING_OBJS)
	42	+ rm -f $@
	43	+ $(AR) $(AR_OPTS) $+
44	44
45	45	libraries: $(LIBPREFIX)processing.$(LIBSUFFIX)
46	46	LIBRARIES += $(LIBPREFIX)processing.$(LIBSUFFIX)