From c03c71b170be97e9bfe0daf5ee6e089c3399c368 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 19 Oct 2015 08:57:31 +0200
Subject: libfdt: Merge into librtemscpu

This allows BSPs to use this library.
---
 cpukit/dtc/libfdt/Makefile.am   |  2 +-
 cpukit/dtc/libfdt/preinstall.am | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

(limited to 'cpukit/dtc')

diff --git a/cpukit/dtc/libfdt/Makefile.am b/cpukit/dtc/libfdt/Makefile.am
index 9d76c63282..687d226f0f 100644
--- a/cpukit/dtc/libfdt/Makefile.am
+++ b/cpukit/dtc/libfdt/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/automake/compile.am
 
 include_HEADERS = fdt.h libfdt.h libfdt_env.h
 
-project_lib_LIBRARIES = libfdt.a
+noinst_LIBRARIES = libfdt.a
 
 libfdt_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)
 libfdt_a_SOURCES =
diff --git a/cpukit/dtc/libfdt/preinstall.am b/cpukit/dtc/libfdt/preinstall.am
index 2c5c51d2dc..36b61f247d 100644
--- a/cpukit/dtc/libfdt/preinstall.am
+++ b/cpukit/dtc/libfdt/preinstall.am
@@ -13,16 +13,6 @@ all-am: $(PREINSTALL_FILES)
 PREINSTALL_FILES =
 CLEANFILES = $(PREINSTALL_FILES)
 
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
 $(PROJECT_INCLUDE)/$(dirstamp):
 	@$(MKDIR_P) $(PROJECT_INCLUDE)
 	@: > $(PROJECT_INCLUDE)/$(dirstamp)
@@ -40,7 +30,3 @@ $(PROJECT_INCLUDE)/libfdt_env.h: libfdt_env.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libfdt_env.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libfdt_env.h
 
-$(PROJECT_LIB)/libfdt.a: libfdt.a $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/libfdt.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libfdt.a
-
-- 
cgit v1.2.3