diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-10-19 08:57:31 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-10-19 09:51:28 +0200 |
commit | c03c71b170be97e9bfe0daf5ee6e089c3399c368 (patch) | |
tree | bf977e81bdb3602d66e34fe9cf5ab6dc0e55e2da | |
parent | bsp/qoriq: Simplify initialization (diff) | |
download | rtems-c03c71b170be97e9bfe0daf5ee6e089c3399c368.tar.bz2 |
libfdt: Merge into librtemscpu
This allows BSPs to use this library.
-rw-r--r-- | cpukit/dtc/libfdt/Makefile.am | 2 | ||||
-rw-r--r-- | cpukit/dtc/libfdt/preinstall.am | 14 | ||||
-rw-r--r-- | cpukit/wrapup/Makefile.am | 1 | ||||
-rw-r--r-- | testsuites/libtests/libfdt01/Makefile.am | 3 |
4 files changed, 3 insertions, 17 deletions
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 - diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index 57ef83275c..c9b326dcaa 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -9,6 +9,7 @@ librtemscpu_a_SOURCES = TMP_LIBS = TMP_LIBS += ../dev/libdev.a +TMP_LIBS += ../dtc/libfdt/libfdt.a TMP_LIBS += ../score/cpu/@RTEMS_CPU@/libscorecpu.a TMP_LIBS += ../score/libscore.a TMP_LIBS += ../sapi/libsapi.a diff --git a/testsuites/libtests/libfdt01/Makefile.am b/testsuites/libtests/libfdt01/Makefile.am index 880d22191e..10a4be6821 100644 --- a/testsuites/libtests/libfdt01/Makefile.am +++ b/testsuites/libtests/libfdt01/Makefile.am @@ -1,6 +1,5 @@ rtems_tests_PROGRAMS = libfdt01 libfdt01_SOURCES = init.c some.c -libfdt01_LDADD = -lfdt dist_rtems_tests_DATA = libfdt01.scn libfdt01.doc @@ -10,7 +9,7 @@ include $(top_srcdir)/../automake/leaf.am AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(libfdt01_OBJECTS) $(libfdt01_LDADD) +LINK_OBJS = $(libfdt01_OBJECTS) LINK_LIBS = $(libfdt01_LDLIBS) libfdt01$(EXEEXT): $(libfdt01_OBJECTS) $(libfdt01_DEPENDENCIES) |