From 9a7d5faec768d7b2dff11b0e4d0db81a741c4c3f Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sat, 25 Apr 2020 21:02:17 +0800 Subject: [PATCH] graphics/nxglib: Remove clean target from Makefile.* since the same thing is already done by graphics/Makefile Signed-off-by: Xiang Xiao Change-Id: Ib4d16e52e954936b4ea2a3d5ee410ab73ee45561 --- graphics/Makefile | 3 --- graphics/nxglib/Make.defs | 1 - graphics/nxglib/Makefile.cursor | 8 ++------ graphics/nxglib/Makefile.devblit | 8 ++------ graphics/nxglib/Makefile.pwfb | 8 ++------ 5 files changed, 6 insertions(+), 22 deletions(-) diff --git a/graphics/Makefile b/graphics/Makefile index 570084822a..704a7babcd 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -146,9 +146,6 @@ clean_context: context: gensources clean: - $(Q) $(MAKE) -C nxglib -f Makefile.devblit clean TOPDIR=$(TOPDIR) EXTRAFLAGS="$(EXTRAFLAGS)" - $(Q) $(MAKE) -C nxglib -f Makefile.pwfb clean TOPDIR=$(TOPDIR) EXTRAFLAGS="$(EXTRAFLAGS)" - $(Q) $(MAKE) -C nxglib -f Makefile.cursor clean TOPDIR=$(TOPDIR) EXTRAFLAGS="$(EXTRAFLAGS)" $(call DELFILE, $(BIN)) $(call CLEAN) diff --git a/graphics/nxglib/Make.defs b/graphics/nxglib/Make.defs index db252c4ba8..ff9132df83 100644 --- a/graphics/nxglib/Make.defs +++ b/graphics/nxglib/Make.defs @@ -112,5 +112,4 @@ endif DEPPATH += --dep-path nxglib CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxglib} -#VPATH += :nxglib VPATH = nxglib diff --git a/graphics/nxglib/Makefile.cursor b/graphics/nxglib/Makefile.cursor index 4544dd9337..9644bb92e1 100644 --- a/graphics/nxglib/Makefile.cursor +++ b/graphics/nxglib/Makefile.cursor @@ -72,7 +72,7 @@ GEN_CSRCS = $(DRAW_CSRC) $(ERASE_CSRC) $(BACKUP_CSRC) BLITDIR = cursor all: $(GEN_CSRCS) -.PHONY : clean distclean +.PHONY : distclean $(DRAW_CSRC) : $(BLITDIR)/nxglib_cursor_draw.c nxglib_bitblit.h ifneq ($(NXGLIB_BITSPERPIXEL),) @@ -95,11 +95,7 @@ ifneq ($(NXGLIB_BITSPERPIXEL),) $(Q) rm -f $(BACKUP_TMP) endif -clean: - $(call DELFILE, *.i) - $(call CLEAN) - -distclean: clean +distclean: $(call DELFILE, nxglib_cursor_draw_*bpp.c) $(call DELFILE, nxglib_cursor_erase_*bpp.c) $(call DELFILE, nxglib_cursor_backup_*bpp.c) diff --git a/graphics/nxglib/Makefile.devblit b/graphics/nxglib/Makefile.devblit index 3e9e332f8d..ea2c51b339 100644 --- a/graphics/nxglib/Makefile.devblit +++ b/graphics/nxglib/Makefile.devblit @@ -118,7 +118,7 @@ BLITDIR = fb endif all: $(GEN_CSRCS) -.PHONY : clean distclean +.PHONY : distclean $(SETP_CSRC) : $(BLITDIR)/nxglib_setpixel.c nxglib_bitblit.h ifneq ($(NXGLIB_BITSPERPIXEL),) @@ -162,11 +162,7 @@ ifneq ($(NXGLIB_BITSPERPIXEL),) $(Q) rm -f $(RCOPY_TMP) endif -clean: - $(call DELFILE, *.i) - $(call CLEAN) - -distclean: clean +distclean: $(call DELFILE, nxglib_setpixel_*bpp.c) $(call DELFILE, nxglib_fillrectangle_*bpp.c) $(call DELFILE, nxglib_getrectangle_*bpp.c) diff --git a/graphics/nxglib/Makefile.pwfb b/graphics/nxglib/Makefile.pwfb index 8776af44b7..8a0277e5fc 100644 --- a/graphics/nxglib/Makefile.pwfb +++ b/graphics/nxglib/Makefile.pwfb @@ -114,7 +114,7 @@ GEN_CSRCS = $(SETP_CSRC) $(RFILL_CSRC) $(RGET_CSRC) $(TFILL_CSRC) $(RMOVE_CSRC) BLITDIR = pwfb all: $(GEN_CSRCS) -.PHONY : clean distclean +.PHONY : distclean $(SETP_CSRC) : $(BLITDIR)/pwfb_setpixel.c nxglib_bitblit.h ifneq ($(NXGLIB_BITSPERPIXEL),) @@ -158,11 +158,7 @@ ifneq ($(NXGLIB_BITSPERPIXEL),) $(Q) rm -f $(RCOPY_TMP) endif -clean: - $(call DELFILE, *.i) - $(call CLEAN) - -distclean: clean +distclean: $(call DELFILE, pwfb_setpixel_*bpp.c) $(call DELFILE, pwfb_fillrectangle_*bpp.c) $(call DELFILE, pwfb_getrectangle_*bpp.c)