build: factor out the .c and .S compile commands as a macro
These commands have the same form, and using a common macro allows it to be used elsewhere without further duplication. Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
parent
97535ffb97
commit
bc877faf7f
15
Makefile
15
Makefile
@ -23,16 +23,23 @@ endif
|
|||||||
IFLAGS := -I. -I$(SRC_PATH)
|
IFLAGS := -I. -I$(SRC_PATH)
|
||||||
CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
|
CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
|
||||||
CFLAGS += $(ECFLAGS)
|
CFLAGS += $(ECFLAGS)
|
||||||
|
CCFLAGS = $(CFLAGS)
|
||||||
YASMFLAGS += $(IFLAGS) -Pconfig.asm
|
YASMFLAGS += $(IFLAGS) -Pconfig.asm
|
||||||
HOSTCFLAGS += $(IFLAGS)
|
HOSTCFLAGS += $(IFLAGS)
|
||||||
|
|
||||||
|
define COMPILE
|
||||||
|
$($(1)DEP)
|
||||||
|
$($(1)) $(CPPFLAGS) $($(1)FLAGS) $($(1)_DEPFLAGS) -c $($(1)_O) $<
|
||||||
|
endef
|
||||||
|
|
||||||
|
COMPILE_C = $(call COMPILE,CC)
|
||||||
|
COMPILE_S = $(call COMPILE,AS)
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
$(CCDEP)
|
$(COMPILE_C)
|
||||||
$(CC) $(CPPFLAGS) $(CFLAGS) $(CC_DEPFLAGS) -c $(CC_O) $<
|
|
||||||
|
|
||||||
%.o: %.S
|
%.o: %.S
|
||||||
$(ASDEP)
|
$(COMPILE_S)
|
||||||
$(AS) $(CPPFLAGS) $(ASFLAGS) $(AS_DEPFLAGS) -c -o $@ $<
|
|
||||||
|
|
||||||
%.ho: %.h
|
%.ho: %.h
|
||||||
$(CC) $(CPPFLAGS) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
|
$(CC) $(CPPFLAGS) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
|
||||||
|
2
configure
vendored
2
configure
vendored
@ -1674,6 +1674,7 @@ SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
|
|||||||
SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
|
SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
|
||||||
LIB_INSTALL_EXTRA_CMD='$$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
|
LIB_INSTALL_EXTRA_CMD='$$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
|
||||||
|
|
||||||
|
AS_O='-o $@'
|
||||||
CC_O='-o $@'
|
CC_O='-o $@'
|
||||||
|
|
||||||
host_cflags='-D_ISOC99_SOURCE -O3 -g'
|
host_cflags='-D_ISOC99_SOURCE -O3 -g'
|
||||||
@ -3273,6 +3274,7 @@ LN_S=$ln_s
|
|||||||
CPPFLAGS=$CPPFLAGS
|
CPPFLAGS=$CPPFLAGS
|
||||||
CFLAGS=$CFLAGS
|
CFLAGS=$CFLAGS
|
||||||
ASFLAGS=$ASFLAGS
|
ASFLAGS=$ASFLAGS
|
||||||
|
AS_O=$CC_O
|
||||||
CC_O=$CC_O
|
CC_O=$CC_O
|
||||||
DLLTOOL=$dlltool
|
DLLTOOL=$dlltool
|
||||||
LDFLAGS=$LDFLAGS
|
LDFLAGS=$LDFLAGS
|
||||||
|
Loading…
x
Reference in New Issue
Block a user