Makefile: abolish COBJS, SOBJS, etc.
The support for COBJS, COBJS-y, SOBJS, SOBJS-y, GLCOBJS, GLSOBJS from scripts/Makefile.build. Going forward we need to use Kbuild style consistently. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
This commit is contained in:
		
							parent
							
								
									620110afe5
								
							
						
					
					
						commit
						3fdf5c8e94
					
				|  | @ -10,10 +10,6 @@ SRCS := | ||||||
| 
 | 
 | ||||||
| include Makefile | include Makefile | ||||||
| 
 | 
 | ||||||
| # Backward compatible: obj-y is preferable
 |  | ||||||
| COBJS := $(sort $(COBJS) $(COBJS-y)) |  | ||||||
| SOBJS := $(sort $(SOBJS) $(SOBJS-y)) |  | ||||||
| 
 |  | ||||||
| # Going forward use the following
 | # Going forward use the following
 | ||||||
| obj-y := $(sort $(obj-y)) | obj-y := $(sort $(obj-y)) | ||||||
| extra-y := $(sort $(extra-y)) | extra-y := $(sort $(extra-y)) | ||||||
|  | @ -24,11 +20,11 @@ obj-y		:= $(patsubst %/, %/built-in.o, $(obj-y)) | ||||||
| subdir-obj-y	:= $(filter %/built-in.o, $(obj-y)) | subdir-obj-y	:= $(filter %/built-in.o, $(obj-y)) | ||||||
| subdir-obj-y	:= $(addprefix $(obj),$(subdir-obj-y)) | subdir-obj-y	:= $(addprefix $(obj),$(subdir-obj-y)) | ||||||
| 
 | 
 | ||||||
| SRCS	+= $(COBJS:.o=.c) $(SOBJS:.o=.S) \
 | SRCS	+= $(wildcard $(obj-y:.o=.c) $(obj-y:.o=.S) $(lib-y:.o=.c) \
 | ||||||
|  $(wildcard $(obj-y:.o=.c) $(obj-y:.o=.S) $(lib-y:.o=.c) $(lib-y:.o=.S) $(extra-y:.o=.c) $(extra-y:.o=.S)) | 	$(lib-y:.o=.S) $(extra-y:.o=.c) $(extra-y:.o=.S)) | ||||||
| OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS) $(obj-y)) | OBJS	:= $(addprefix $(obj),$(obj-y)) | ||||||
| 
 | 
 | ||||||
| LGOBJS := $(addprefix $(obj),$(sort $(GLSOBJS) $(GLCOBJS)) $(lib-y)) | LGOBJS := $(addprefix $(obj),$(sort $(lib-y))) | ||||||
| 
 | 
 | ||||||
| all: $(LIB) $(addprefix $(obj),$(extra-y)) | all: $(LIB) $(addprefix $(obj),$(extra-y)) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue