diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-10-16 18:50:03 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-10-16 18:50:03 +0000 |
commit | 49ed8e775846ec69a1100c7d5ae26b0d68cf6db8 (patch) | |
tree | 5eebc0fae56780d93ad8dc0e880b785461a954e0 /c/src/lib/include | |
parent | 2001-10-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-49ed8e775846ec69a1100c7d5ae26b0d68cf6db8.tar.bz2 |
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/zilog/Makefile.am: Remove.
* include/motorola/Makefile.am: Remove.
* include/sys/Makefile.am: Remove.
* include/rtems/Makefile.am: Remove.
* include/Makefile.am: Handle subdirs, require automake-1.5
* Makefile.am: Require automake-1.5.
Diffstat (limited to 'c/src/lib/include')
-rw-r--r-- | c/src/lib/include/Makefile.am | 64 | ||||
-rw-r--r-- | c/src/lib/include/motorola/Makefile.am | 21 | ||||
-rw-r--r-- | c/src/lib/include/rtems/Makefile.am | 21 | ||||
-rw-r--r-- | c/src/lib/include/sys/Makefile.am | 33 | ||||
-rw-r--r-- | c/src/lib/include/zilog/Makefile.am | 21 |
5 files changed, 60 insertions, 100 deletions
diff --git a/c/src/lib/include/Makefile.am b/c/src/lib/include/Makefile.am index 29652d714d..2bb731f2ee 100644 --- a/c/src/lib/include/Makefile.am +++ b/c/src/lib/include/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 include_HEADERS = bspIo.h chain.h console.h clockdrv.h iosupp.h ringbuf.h rtc.h \ spurious.h timerdrv.h vmeintr.h @@ -12,12 +12,68 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE) \ $(PROJECT_INCLUDE): @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/motorola: + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/rtems: + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/sys: + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/zilog: + @$(mkinstalldirs) $@ + $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -all-local: $(PREINSTALL_FILES) +## motorola + +include_motoroladir = $(includedir)/motorola + +include_motorola_HEADERS = motorola/mc68230.h motorola/mc68681.h + +PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola \ + $(include_motorola_HEADERS:%=$(PROJECT_INCLUDE)/%) + +## rtems +include_rtemsdir = $(includedir)/rtems + +include_rtems_HEADERS = \ + rtems/assoc.h rtems/error.h rtems/libcsupport.h rtems/libio.h rtems/libio_.h \ + rtems/termiostypes.h + +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ + $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%) -SUBDIRS = sys rtems motorola zilog +## sys + +include_sysdir = $(includedir)/sys + +if !HAS_NETWORKING +NETWORKING_H_FILES = sys/ioctl.h +endif + +if NEWLIB +NEWLIB_H_FILES = sys/termios.h sys/cdefs.h +endif + +include_sys_HEADERS = \ +sys/ioccom.h \ +sys/ttycom.h \ +sys/utime.h \ +$(NEWLIB_H_FILES) $(NETWORKING_H_FILES) + +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \ + $(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/%) + +## zilog + +include_zilogdir = $(includedir)/zilog + +include_zilog_HEADERS = zilog/z8036.h zilog/z8530.h zilog/z8536.h + +PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \ + $(include_zilog_HEADERS:%=$(PROJECT_INCLUDE)/%) + +## General stuff +all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/include/motorola/Makefile.am b/c/src/lib/include/motorola/Makefile.am deleted file mode 100644 index 06bb3cda89..0000000000 --- a/c/src/lib/include/motorola/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_motoroladir = $(includedir)/motorola - -include_motorola_HEADERS = mc68230.h mc68681.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/motorola \ - $(include_motorola_HEADERS:%=$(PROJECT_INCLUDE)/motorola/%) - -$(PROJECT_INCLUDE)/motorola: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/motorola/%.h: %.h - $(INSTALL_DATA) $< $@ - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/include/rtems/Makefile.am b/c/src/lib/include/rtems/Makefile.am deleted file mode 100644 index b10c786f59..0000000000 --- a/c/src/lib/include/rtems/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_rtemsdir = $(includedir)/rtems - -include_rtems_HEADERS = assoc.h error.h libcsupport.h libio.h libio_.h termiostypes.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ - $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) - -$(PROJECT_INCLUDE)/rtems: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/rtems/%.h: %.h - $(INSTALL_DATA) $< $@ - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/include/sys/Makefile.am b/c/src/lib/include/sys/Makefile.am deleted file mode 100644 index a37abad178..0000000000 --- a/c/src/lib/include/sys/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_sysdir = $(includedir)/sys - -if HAS_NETWORKING -else -NETWORKING_H_FILES = ioctl.h -endif - -if NEWLIB -NEWLIB_H_FILES = termios.h cdefs.h -endif - -include_sys_HEADERS = ioccom.h ttycom.h utime.h \ - $(NEWLIB_H_FILES) $(NETWORKING_H_FILES) - -noinst_HEADERS = utime.h termios.h ioctl.h ioccom.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/sys \ - $(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/sys/%) - -$(PROJECT_INCLUDE)/sys: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/sys/%.h: %.h - $(INSTALL_DATA) $< $@ - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/include/zilog/Makefile.am b/c/src/lib/include/zilog/Makefile.am deleted file mode 100644 index 64884d8052..0000000000 --- a/c/src/lib/include/zilog/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_zilogdir = ${includedir}/zilog - -include_zilog_HEADERS = z8036.h z8530.h z8536.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/zilog \ - $(include_zilog_HEADERS:%=$(PROJECT_INCLUDE)/zilog/%) - -$(PROJECT_INCLUDE)/zilog: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/zilog/%.h: %.h - $(INSTALL_DATA) $< $@ - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../automake/local.am |