diff options
author | Chris Johns <chrisj@rtems.org> | 2017-05-24 09:21:04 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2017-05-24 09:24:35 +1000 |
commit | 8aa62776b3cba9eb3f45447405062d271ffb719c (patch) | |
tree | f1790ca067fefcbb7844e7de71447c2e69f54cb2 | |
parent | arm: Fix profiling support of Thumb-1 targets (diff) | |
download | rtems-8aa62776b3cba9eb3f45447405062d271ffb719c.tar.bz2 |
cpukit/libxz: Fix the include path to remove the make warnings.
-rw-r--r-- | cpukit/Makefile.am | 5 | ||||
-rw-r--r-- | cpukit/preinstall.am | 13 |
2 files changed, 6 insertions, 12 deletions
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 1987586b7c..3206ee2123 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -50,15 +50,14 @@ include_uuid_HEADERS = libmisc/uuid/uuid.h include_utf8procdir = $(includedir)/utf8proc include_utf8proc_HEADERS = libmisc/utf8proc/utf8proc.h -include_xzdir = $(includedir) -include_xz_HEADERS = libmisc/xz/xz.h - include_sysdir = $(includedir)/sys include_sys_HEADERS = include_HEADERS += include/crypt.h include_HEADERS += include/memory.h +include_HEADERS += libmisc/xz/xz.h + include_sys_HEADERS += libcsupport/include/sys/event.h include_sys_HEADERS += libcsupport/include/sys/filio.h include_sys_HEADERS += libcsupport/include/sys/ioccom.h diff --git a/cpukit/preinstall.am b/cpukit/preinstall.am index 2ae31ef987..6f94076cdd 100644 --- a/cpukit/preinstall.am +++ b/cpukit/preinstall.am @@ -50,15 +50,6 @@ $(PROJECT_INCLUDE)/utf8proc/utf8proc.h: libmisc/utf8proc/utf8proc.h $(PROJECT_IN $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/utf8proc/utf8proc.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/utf8proc/utf8proc.h -$(PROJECT_INCLUDE)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE) - @: > $(PROJECT_INCLUDE)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) - -$(PROJECT_INCLUDE)/xz.h: libmisc/xz/xz.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/xz.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/xz.h - $(PROJECT_INCLUDE)/sys/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/sys @: > $(PROJECT_INCLUDE)/sys/$(dirstamp) @@ -72,6 +63,10 @@ $(PROJECT_INCLUDE)/memory.h: include/memory.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/memory.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/memory.h +$(PROJECT_INCLUDE)/xz.h: libmisc/xz/xz.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/xz.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/xz.h + $(PROJECT_INCLUDE)/sys/event.h: libcsupport/include/sys/event.h $(PROJECT_INCLUDE)/sys/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/event.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/event.h |