From 77bb7e1f79514aa03a171645429f512efc89f5d7 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 19 Feb 2012 13:01:53 +0000 Subject: Simplify link flags computation --- dde_e100/Makeconf.local | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) (limited to 'dde_e100') diff --git a/dde_e100/Makeconf.local b/dde_e100/Makeconf.local index 074df6e0..fb8e6ae6 100644 --- a/dde_e100/Makeconf.local +++ b/dde_e100/Makeconf.local @@ -2,31 +2,12 @@ SYSTEMS = x86-l4v2 ARCH = x86 SYSTEM = x86-l4v2 -BUILDDIR ?= +BUILDDIR ?= .. -libmachdev_path := ../libmachdev/libmachdev.a -has_libmachdev := $(wildcard $(libmachdev_path)) -ifeq ($(strip $(has_libmachdev)),) - libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a -endif - -libddekit_path := ../libddekit/libddekit.a -has_libddekit := $(wildcard $(libddekit_path)) -ifeq ($(strip $(has_libddekit)),) - libddekit_path := $(BUILDDIR)/libddekit/libddekit.a -endif - -libslab_path := ../libhurd-slab/libhurd-slab.a -has_libslab := $(wildcard $(libslab_path)) -ifeq ($(strip $(has_libslab)),) - libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a -endif - -libbpf_path := ../libbpf/libbpf.a -has_libbpf := $(wildcard $(libbpf_path)) -ifeq ($(strip $(has_libbpf)),) - libbpf_path := $(BUILDDIR)/libbpf/libbpf.a -endif +libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a +libddekit_path := $(BUILDDIR)/libddekit/libddekit.a +libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a +libbpf_path := $(BUILDDIR)/libbpf/libbpf.a DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include -- cgit v1.2.3