From 80bfe228b1a8d10d8ef22a4014ebd8c5aeaf1a10 Mon Sep 17 00:00:00 2001 From: Cyril Hrubis Date: Sat, 8 Dec 2012 17:09:11 +0100 Subject: [PATCH] build: Remove check for LIBNAME from gen.mk --- gen.mk | 4 ---- include/core/Makefile | 5 +++-- tests/core/Makefile | 3 --- tests/core/WritePixel_testsuite.gen.c.t | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/gen.mk b/gen.mk index 14aac0dd..6cd9b47d 100644 --- a/gen.mk +++ b/gen.mk @@ -1,10 +1,6 @@ # # This is makefile rule for generating C sources from python templates # -ifndef LIBNAME -$(error LIBNAME not defined, fix your library Makefile) -endif - ifndef GENHEADERS GENHEADERS= endif diff --git a/include/core/Makefile b/include/core/Makefile index c68d42ed..5606d74b 100644 --- a/include/core/Makefile +++ b/include/core/Makefile @@ -1,9 +1,10 @@ TOPDIR=../.. + +include $(TOPDIR)/pre.mk + GENHEADERS=GP_Convert_Scale.gen.h GP_Pixel.gen.h \ GP_GetPutPixel.gen.h GP_Convert.gen.h GP_FnPerBpp.gen.h \ GP_MixPixels.gen.h GP_GammaCorrection.gen.h GP_GammaPixel.gen.h -LIBNAME=core -include $(TOPDIR)/pre.mk include $(TOPDIR)/gen.mk include $(TOPDIR)/post.mk diff --git a/tests/core/Makefile b/tests/core/Makefile index 54d105a3..91185c26 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -4,9 +4,6 @@ include $(TOPDIR)/pre.mk CSOURCES=Context.c -# hack -LIBNAME=core - GENSOURCES+=WritePixel_testsuite.gen.c GetPutPixel.gen.c APPS=WritePixel_testsuite.gen Context GetPutPixel.gen diff --git a/tests/core/WritePixel_testsuite.gen.c.t b/tests/core/WritePixel_testsuite.gen.c.t index 365c247c..df49d2d4 100644 --- a/tests/core/WritePixel_testsuite.gen.c.t +++ b/tests/core/WritePixel_testsuite.gen.c.t @@ -26,7 +26,7 @@ #include -#include "GP_WritePixel.h" +#include #include "tst_test.h" -- 2.11.4.GIT