update Makefile.am

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>

diff --git a/src/shaders/post_processing/Makefile.am b/src/shaders/post_processing/Makefile.am
index 7c89553..b19020f 100644 (file)
--- a/src/shaders/post_processing/Makefile.am
+++ b/src/shaders/post_processing/Makefile.am
@@ -1 +1,4 @@
 SUBDIRS = gen5_6 gen7
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/shaders/post_processing/gen7/Makefile.am b/src/shaders/post_processing/gen7/Makefile.am
index 9dc6361..aeb5e59 100644 (file)
--- a/src/shaders/post_processing/gen7/Makefile.am
+++ b/src/shaders/post_processing/gen7/Makefile.am
@@ -1,51 +1,62 @@
-INTEL_PP_G7B =                 \
+INTEL_PP_G7B = \
+       avs.g7b                 \
        dndi.g7b                \
-       avs.g7b
-
-INTEL_PP_G4A =                 \
-       DI_Core.g4a     \
-       DI_Save_NV12_16x4.g4a\
-       DI_Save_PA_16x4.g4a\
-       EOT.g4a\
-       VP_Setup.g4a\
-       Set_Layer_0.g4a\
-       PA_AVS_Buf_0.g4a\
-       PA_AVS_Buf_1.g4a\
-       PA_AVS_Buf_2.g4a\
-       PA_AVS_Buf_3.g4a\
-       PL2_AVS_Buf_0.g4a\
-       PL2_AVS_Buf_1.g4a\
-       PL2_AVS_Buf_2.g4a\
-       PL2_AVS_Buf_3.g4a\
-       PL3_AVS_Buf_0.g4a\
-       PL3_AVS_Buf_1.g4a \
-       PL3_AVS_Buf_2.g4a\
-       PL3_AVS_Buf_3.g4a\
-       Set_AVS_Buf_0123_VYUA.g4a\
-       Save_AVS_RGB.g4a\
-       Save_AVS_PA.g4a  \
-       Save_AVS_PL3.g4a\
-       Save_AVS_NV12.g4a\
-       Set_AVS_Buf_0123_BGRA.g4a\
-       Set_AVS_Buf_0123_PL2.g4a\
-       Set_AVS_Buf_0123_PL3.g4a\
-       Set_AVS_Buf_0123_VUYA.g4a
-
-EXTRA_DIST =   \
-       $(INTEL_PP_G7B)
+       $(NULL)
+
+INTEL_PP_G4A = \
+       DI_Core.g4a                     \
+       DI_Save_NV12_16x4.g4a           \
+       DI_Save_PA_16x4.g4a             \
+       EOT.g4a                         \
+       PA_AVS_Buf_0.g4a                \
+       PA_AVS_Buf_1.g4a                \
+       PA_AVS_Buf_2.g4a                \
+       PA_AVS_Buf_3.g4a                \
+       PL2_AVS_Buf_0.g4a               \
+       PL2_AVS_Buf_1.g4a               \
+       PL2_AVS_Buf_2.g4a               \
+       PL2_AVS_Buf_3.g4a               \
+       PL3_AVS_Buf_0.g4a               \
+       PL3_AVS_Buf_1.g4a               \
+       PL3_AVS_Buf_2.g4a               \
+       PL3_AVS_Buf_3.g4a               \
+       Save_AVS_PA.g4a                 \
+       Save_AVS_PL3.g4a                \
+       Save_AVS_NV12.g4a               \
+       Save_AVS_RGB.g4a                \
+       Set_AVS_Buf_0123_BGRA.g4a       \
+       Set_AVS_Buf_0123_PL2.g4a        \
+       Set_AVS_Buf_0123_PL3.g4a        \
+       Set_AVS_Buf_0123_VUYA.g4a       \
+       Set_AVS_Buf_0123_VYUA.g4a       \
+       Set_Layer_0.g4a                 \
+       VP_Setup.g4a                    \
+       $(NULL)
+
+INTEL_PP_ASM = $(INTEL_PP_G7B:%.g7b=%.asm)
+INTEL_PP_GEN7_ASM = $(INTEL_PP_G7B:%.g7b=%.g7s)
 
+TARGETS  =
 if HAVE_GEN4ASM
+TARGETS += $(INTEL_PP_G7B)
+endif
 
-$(INTEL_PP_G7B): $(INTEL_PP_G4A)
-       @_PP_TARGET=$@; \
-       cpp $${_PP_TARGET/.g7b/.asm} > _pp0.asm; \
-       ../../gpp.py _pp0.asm _pp1.asm; \
-       intel-gen4asm -a -o $@ -g 7 _pp1.asm; \
-       rm _pp0.asm _pp1.asm
+all-local: $(TARGETS)
 
-BUILT_SOURCES= $(INTEL_PP_G7B)
+SUFFIXES = .g7b .g7s .asm
 
-clean-local:
-       -rm -f $(INTEL_PP_G7B)
+$(INTEL_PP_GEN7_ASM): $(INTEL_PP_ASM)
+.asm.g7s:
+       cpp $< > _pp0.$@;               \
+       ../../gpp.py _pp0.$@ $@;        \
+       rm _pp0.$@
+.g7s.g7b:
+       intel-gen4asm -a -o $@ -g 7 $<
+
+CLEANFILES = $(INTEL_PP_GEN7_ASM)
+
+EXTRA_DIST = \
+       $(INTEL_PP_G7B)
 
-endif    
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in