2002-11-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am: Merge in include/Makefile.am.
	* include/Makefile.am: Remove.
	* configure.ac: Reflect changes above.
This commit is contained in:
Ralf Corsepius
2002-11-07 22:28:18 +00:00
parent 7395fa5e33
commit 7c9a5989c8
11 changed files with 98 additions and 101 deletions
+6
View File
@@ -1,3 +1,9 @@
2002-11-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge in include/Makefile.am.
* include/Makefile.am: Remove.
* configure.ac: Reflect changes above.
2002-11-01 Joel Sherrill <joel@OARcorp.com>
* delay/delay.c, score/ispsh7032.c: Removed warnings.
+24 -1
View File
@@ -4,7 +4,30 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
SUBDIRS = include score clock timer sci delay
SUBDIRS = . score clock timer sci delay
# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
# file name conflicts
include_shdir = $(includedir)/sh
include_rtems_scoredir = $(includedir)/rtems/score
include_sh_HEADERS = include/sci.h include/sh7_pfc.h include/sh7_sci.h
include_rtems_score_HEADERS = include/ispsh7032.h include/iosh7032.h
$(PROJECT_INCLUDE)/sh:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/sh/%.h: include/%.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/rtems/score/%.h: include/%.h
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES = $(PROJECT_INCLUDE)/sh \
$(include_sh_HEADERS:include/%.h=$(PROJECT_INCLUDE)/sh/%.h) \
$(include_rtems_score_HEADERS:include/%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
all-local: $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../../../automake/subdirs.am
include $(top_srcdir)/../../../../../../automake/local.am
-1
View File
@@ -31,7 +31,6 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
AC_CONFIG_FILES([Makefile
clock/Makefile
delay/Makefile
include/Makefile
score/Makefile
timer/Makefile
sci/Makefile])
@@ -1,29 +0,0 @@
##
## $Id$
##
# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
# file name conflicts
include_shdir = $(includedir)/sh
include_rtems_scoredir = $(includedir)/rtems/score
include_sh_HEADERS = sci.h sh7_pfc.h sh7_sci.h
include_rtems_score_HEADERS = ispsh7032.h iosh7032.h
$(PROJECT_INCLUDE)/sh:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/sh/%.h: %.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/rtems/score/%.h: %.h
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES = $(PROJECT_INCLUDE)/sh \
$(include_sh_HEADERS:%=$(PROJECT_INCLUDE)/sh/%) \
$(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
all-local: $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../../../automake/local.am
+6
View File
@@ -1,3 +1,9 @@
2002-11-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge in include/Makefile.am.
* include/Makefile.am: Remove.
* configure.ac: Reflect changes above.
2002-11-01 Joel Sherrill <joel@OARcorp.com>
* score/cpu_asm.c, score/ispsh7045.c: Removed warnings.
+25 -1
View File
@@ -4,7 +4,31 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
SUBDIRS = include score clock sci timer
SUBDIRS = . score clock sci timer
# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
# file name conflicts
include_shdir = $(includedir)/sh
include_rtems_scoredir = $(includedir)/rtems/score
include_sh_HEADERS = include/io_types.h include/sci.h include/sh7_pfc.h \
include/sh7_sci.h include/sci_termios.h
include_rtems_score_HEADERS = include/ispsh7045.h include/iosh7045.h
$(PROJECT_INCLUDE)/sh:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/sh/%.h: include/%.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/rtems/score/%.h: include/%.h
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES = $(PROJECT_INCLUDE)/sh \
$(include_sh_HEADERS:include/%=$(PROJECT_INCLUDE)/sh/%) \
$(include_rtems_score_HEADERS:include/%=$(PROJECT_INCLUDE)/rtems/score/%)
all-local: $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../../../automake/subdirs.am
include $(top_srcdir)/../../../../../../automake/local.am
@@ -1,31 +0,0 @@
##
## $Id$
##
# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
# file name conflicts
include_shdir = $(includedir)/sh
include_rtems_scoredir = $(includedir)/rtems/score
include_sh_HEADERS = io_types.h sci.h sh7_pfc.h sh7_sci.h sci_termios.h
include_rtems_score_HEADERS = ispsh7045.h iosh7045.h
$(PROJECT_INCLUDE)/sh:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/sh/%.h: %.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/rtems/score/%.h: %.h
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES = $(PROJECT_INCLUDE)/sh \
$(include_sh_HEADERS:%=$(PROJECT_INCLUDE)/sh/%) \
$(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
all-local: $(TMPINSTALL_FILES)
EXTRA_DIST = io_types.h sci.h sh7_pfc.h sh7_sci.h sci_termios.h
include $(top_srcdir)/../../../../../../automake/local.am
+6
View File
@@ -1,3 +1,9 @@
2002-11-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge in include/Makefile.am.
* include/Makefile.am: Remove.
* configure.ac: Reflect changes above.
2002-11-01 Joel Sherrill <joel@OARcorp.com>
* score/cpu_asm.c, score/ispsh7750.c: Removed warnings.
+31 -1
View File
@@ -4,7 +4,37 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
SUBDIRS = include score clock sci timer
SUBDIRS = . score clock sci timer
# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
# file name conflicts
include_shdir = $(includedir)/sh
include_rtems_scoredir = $(includedir)/rtems/score
include_sh_HEADERS = include/sh/sh4uart.h
include_rtems_score_HEADERS = \
include/rtems/score/sh7750_regs.h \
include/rtems/score/ipl.h \
include/rtems/score/iosh7750.h \
include/rtems/score/ispsh7750.h \
include/rtems/score/sh4_regs.h
$(PROJECT_INCLUDE)/sh:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/score:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: include/%.h
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES = \
$(PROJECT_INCLUDE)/sh \
$(include_sh_HEADERS:include/%=$(PROJECT_INCLUDE)/%) \
$(PROJECT_INCLUDE)/rtems/score \
$(include_rtems_score_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
all-local: $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../../../automake/subdirs.am
include $(top_srcdir)/../../../../../../automake/local.am
-1
View File
@@ -30,7 +30,6 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
clock/Makefile
include/Makefile
score/Makefile
sci/Makefile
timer/Makefile])
@@ -1,36 +0,0 @@
##
## $Id$
##
# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
# file name conflicts
include_shdir = $(includedir)/sh
include_rtems_scoredir = $(includedir)/rtems/score
include_sh_HEADERS = sh/sh4uart.h
include_rtems_score_HEADERS = \
rtems/score/sh7750_regs.h \
rtems/score/ipl.h \
rtems/score/iosh7750.h \
rtems/score/ispsh7750.h \
rtems/score/sh4_regs.h
$(PROJECT_INCLUDE)/sh:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/score:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES = \
$(PROJECT_INCLUDE)/sh \
$(include_sh_HEADERS:%=$(PROJECT_INCLUDE)/%) \
$(PROJECT_INCLUDE)/rtems/score \
$(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../../../automake/local.am