From 5f79afca64721f30bb47d51553a14ea692d085b7 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 16 Mar 2015 10:41:14 +0100 Subject: Include make.rules in the library Makefiles Make sure to include make.rules from the Makefiles in the common lib folder to get some more sane console output during the build process. Signed-off-by: Thomas Huth Signed-off-by: Alexey Kardashevskiy --- lib/libbcm/Makefile | 2 ++ lib/libbootmsg/Makefile | 2 ++ lib/libe1k/Makefile | 2 ++ lib/libhvcall/Makefile | 2 ++ lib/libusb/Makefile | 2 ++ lib/libveth/Makefile | 2 ++ lib/libvirtio/Makefile | 2 ++ 7 files changed, 14 insertions(+) diff --git a/lib/libbcm/Makefile b/lib/libbcm/Makefile index b17e588..1aead4c 100644 --- a/lib/libbcm/Makefile +++ b/lib/libbcm/Makefile @@ -12,6 +12,8 @@ TOPCMNDIR ?= ../.. +include $(TOPCMNDIR)/make.rules + CPPFLAGS = -I../libc/include $(CPUARCHDEF) -I$(INCLBRDDIR) \ -I$(INCLCMNDIR) -I$(INCLCMNDIR)/$(CPUARCH) diff --git a/lib/libbootmsg/Makefile b/lib/libbootmsg/Makefile index 891987e..642c970 100644 --- a/lib/libbootmsg/Makefile +++ b/lib/libbootmsg/Makefile @@ -12,6 +12,8 @@ TOPCMNDIR ?= ../.. +include $(TOPCMNDIR)/make.rules + ASFLAGS = $(FLAG) $(RELEASE) $(CPUARCHDEF) -Wa,-mregnames CPPFLAGS = -I../libc/include $(CPUARCHDEF) -I$(INCLBRDDIR) -I. -I../../include LDFLAGS = -nostdlib diff --git a/lib/libe1k/Makefile b/lib/libe1k/Makefile index 24cddc7..0c3169f 100644 --- a/lib/libe1k/Makefile +++ b/lib/libe1k/Makefile @@ -12,6 +12,8 @@ TOPCMNDIR ?= ../.. +include $(TOPCMNDIR)/make.rules + CPPFLAGS = -I../libc/include $(CPUARCHDEF) -I$(INCLBRDDIR) \ -I$(INCLCMNDIR) -I$(INCLCMNDIR)/$(CPUARCH) diff --git a/lib/libhvcall/Makefile b/lib/libhvcall/Makefile index af7fbc3..2a9b2d7 100644 --- a/lib/libhvcall/Makefile +++ b/lib/libhvcall/Makefile @@ -12,6 +12,8 @@ TOPCMNDIR ?= ../.. +include $(TOPCMNDIR)/make.rules + ASFLAGS = $(FLAG) $(RELEASE) $(CPUARCHDEF) -Wa,-mregnames CPPFLAGS = -I../libc/include $(CPUARCHDEF) -I$(INCLBRDDIR) \ -I$(INCLCMNDIR) -I$(INCLCMNDIR)/$(CPUARCH) diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile index ee065be..0780489 100644 --- a/lib/libusb/Makefile +++ b/lib/libusb/Makefile @@ -12,6 +12,8 @@ TOPCMNDIR ?= ../.. +include $(TOPCMNDIR)/make.rules + ASFLAGS = $(FLAG) $(RELEASE) $(CPUARCHDEF) -Wa,-mregnames CPPFLAGS = -I../libc/include $(CPUARCHDEF) -I$(INCLBRDDIR) \ -I$(INCLCMNDIR) -I$(INCLCMNDIR)/$(CPUARCH) -I$(SLOFCMNDIR) diff --git a/lib/libveth/Makefile b/lib/libveth/Makefile index 4556110..dd1234a 100644 --- a/lib/libveth/Makefile +++ b/lib/libveth/Makefile @@ -12,6 +12,8 @@ TOPCMNDIR ?= ../.. +include $(TOPCMNDIR)/make.rules + CPPFLAGS = -I../libc/include $(CPUARCHDEF) -I$(INCLBRDDIR) \ -I$(INCLCMNDIR) -I$(INCLCMNDIR)/$(CPUARCH) CPPFLAGS += -I../libhvcall diff --git a/lib/libvirtio/Makefile b/lib/libvirtio/Makefile index 430f9a7..bd6a1fa 100644 --- a/lib/libvirtio/Makefile +++ b/lib/libvirtio/Makefile @@ -12,6 +12,8 @@ TOPCMNDIR ?= ../.. +include $(TOPCMNDIR)/make.rules + ASFLAGS = $(FLAG) $(RELEASE) $(CPUARCHDEF) -Wa,-mregnames CPPFLAGS = -I../libc/include $(CPUARCHDEF) -I$(INCLBRDDIR) \ -I$(INCLCMNDIR) -I$(INCLCMNDIR)/$(CPUARCH) -- cgit v1.1