Browse Source

[Makefiles] Drop %.e target

Commonly %.i or %.s is used for preprocessed files, not %.e. Drop it in
preference to %.i and %.s.
Isaku Yamahata 5 years ago
parent
commit
204938ee35

+ 2 - 2
LibOS/shim/src/Makefile

@@ -104,7 +104,7 @@ elf/shim_rtld.o: $(wildcard elf/*.h)
 %.o: %.c $(headers)
 	$(call cmd,cc_o_c)
 
-%.e %.i: %.c $(headers)
+%.i: %.c $(headers)
 	$(call cmd,cpp_i_c)
 
 %.s: %.c $(headers)
@@ -113,7 +113,7 @@ elf/shim_rtld.o: $(wildcard elf/*.h)
 %.o: %.S $(headers)
 	$(call cmd,as_o_S)
 
-%.e %.s: %.S $(headers)
+%.s: %.S $(headers)
 	$(call cmd,cpp_s_S)
 
 syscallas.S shim_checkpoint.c: asm-offsets.h

+ 1 - 1
Pal/src/Makefile

@@ -146,7 +146,7 @@ $(OBJ_DIR)/%.o: %.c $(headers)
 	@mkdir -p $(OBJ_DIR)
 	$(call cmd,cc_o_c)
 
-$(OBJ_DIR)/%.e $(OBJ_DIR)/%.i: %.c $(headers)
+$(OBJ_DIR)/%.i: %.c $(headers)
 	@mkdir -p $(OBJ_DIR)
 	$(call cmd,cpp_i_c)
 

+ 2 - 2
Pal/src/host/FreeBSD/Makefile

@@ -35,7 +35,7 @@ libpal-FreeBSD.a: $(addsuffix .o,$(objs)) $(graphene_lib)
 %.o: %.c $(headers)
 	$(call cmd,cc_o_c)
 
-%.e %.i: %.c $(headers)
+%.i: %.c $(headers)
 	$(call cmd,cpp_i_c)
 
 %.s: %.c $(headers)
@@ -44,7 +44,7 @@ libpal-FreeBSD.a: $(addsuffix .o,$(objs)) $(graphene_lib)
 %.o: %.S $(headers)
 	$(call cmd,as_o_S)
 
-%.e %.s: %.S $(headers)
+%.s: %.S $(headers)
 	$(call cmd,cpp_s_S)
 
 

+ 0 - 7
Pal/src/host/Linux-SGX/Makefile

@@ -40,10 +40,6 @@ $(addsuffix .o,$(enclave-objs)): CFLAGS += -DIN_ENCLAVE
 $(addsuffix .o,$(enclave-objs)): %.o: %.c $(headers)
 	$(call cmd,cc_o_c)
 
-$(addsuffix .e,$(enclave-objs)): CFLAGS += -DIN_ENCLAVE
-$(addsuffix .e,$(enclave-objs)): %.e: %.c $(headers)
-	$(call cmd,cpp_i_c)
-
 $(addsuffix .i,$(enclave-objs)): CFLAGS += -DIN_ENCLAVE
 $(addsuffix .i,$(enclave-objs)): %.i: %.c $(headers)
 	$(call cmd,cpp_i_c)
@@ -63,9 +59,6 @@ $(addsuffix .s,$(enclave-asm-objs)): %.s: %.S $(headers)
 $(addsuffix .o,$(urts-objs)): %.o: %.c $(headers)
 	$(call cmd,cc_o_c)
 
-$(addsuffix .e,$(urts-objs)): %.e: %.c $(headers)
-	$(call cmd,cpp_i_c)
-
 $(addsuffix .i,$(urts-objs)): %.i: %.c $(headers)
 	$(call cmd,cpp_i_c)
 

+ 2 - 2
Pal/src/host/Linux/Makefile

@@ -36,7 +36,7 @@ libpal-Linux.a: $(addsuffix .o,$(objs)) $(graphene_lib)
 %.o: %.c $(headers)
 	$(call cmd,cc_o_c)
 
-%.e %.i: %.c $(headers)
+%.i: %.c $(headers)
 	$(call cmd,cpp_i_c)
 
 %.s: %.c $(headers)
@@ -45,7 +45,7 @@ libpal-Linux.a: $(addsuffix .o,$(objs)) $(graphene_lib)
 %.o: %.S $(headers)
 	$(call cmd,as_o_S)
 
-%.e %.s: %.S $(headers)
+%.s: %.S $(headers)
 	$(call cmd,cpp_s_S)
 
 include ../../../../Makefile.rules

+ 1 - 1
Pal/src/security/Linux/Makefile

@@ -26,7 +26,7 @@ libpal_sec.so: $(addsuffix .o,$(objs)) $(graphene_lib)
 %.o: %.c
 	$(call cmd,cc_o_c)
 
-%.e %.i: %.c
+%.i: %.c
 	$(call cmd,cpp_i_o)
 
 %.s: %.c