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

* Makefile.am: Merge-in arpa/Makefile.am, machine/Makefile.am,
	sys/Makefile.am, vm/Makefile.am.
	Add . to SUBDIRS.
	* arpa/Makefile.am: Remove.
	* machine/Makefile.am: Remove.
	* sys/Makefile.am: Remove.
	* vm/Makefile.am: Remove.
	* configure.ac: Reflect changes above.
This commit is contained in:
Ralf Corsepius
2002-11-15 14:55:12 +00:00
parent 2d3c472b0f
commit 471bcf071f
7 changed files with 71 additions and 95 deletions

View File

@@ -1,3 +1,14 @@
2002-11-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in arpa/Makefile.am, machine/Makefile.am,
sys/Makefile.am, vm/Makefile.am.
Add . to SUBDIRS.
* arpa/Makefile.am: Remove.
* machine/Makefile.am: Remove.
* sys/Makefile.am: Remove.
* vm/Makefile.am: Remove.
* configure.ac: Reflect changes above.
2002-11-06 Chris Johns <ccj@acm.org> 2002-11-06 Chris Johns <ccj@acm.org>
* sys/select.h: Add C++ to C external. * sys/select.h: Add C++ to C external.

View File

@@ -4,7 +4,7 @@
ACLOCAL_AMFLAGS = -I ../aclocal ACLOCAL_AMFLAGS = -I ../aclocal
SUBDIRS = arpa kern machine sys vm lib libc net netinet nfs rtems SUBDIRS = . kern lib libc net netinet nfs rtems
SUBDIRS += wrapup SUBDIRS += wrapup
## poll.h is not in the list because RTEMS does not have poll() ## poll.h is not in the list because RTEMS does not have poll()
@@ -13,11 +13,69 @@ include_HEADERS = \
bpfilter.h loop.h netdb.h opt_ipfw.h opt_mrouting.h \ bpfilter.h loop.h netdb.h opt_ipfw.h opt_mrouting.h \
opt_tcpdebug.h resolv.h syslog.h memory.h opt_tcpdebug.h resolv.h syslog.h memory.h
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
PREINSTALL_FILES = $(PROJECT_INCLUDE) \ PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
$(PROJECT_INCLUDE): # arpa
include_arpadir = $(includedir)/arpa
include_arpa_HEADERS = arpa/ftp.h arpa/inet.h arpa/nameser.h \
arpa/nameser_compat.h arpa/telnet.h
$(PROJECT_INCLUDE)/arpa:
@$(mkinstalldirs) $@ @$(mkinstalldirs) $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa \
$(include_arpa_HEADERS:%=$(PROJECT_INCLUDE)/%)
## machine
include_machinedir = $(includedir)/machine
include_machine_HEADERS = machine/conf.h machine/cpu.h machine/cpufunc.h \
machine/endian.h machine/in_cksum.h machine/vmparam.h
$(PROJECT_INCLUDE)/machine:
@$(mkinstalldirs) $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine \
$(include_machine_HEADERS:%=$(PROJECT_INCLUDE)/%)
# sys
include_sysdir = $(includedir)/sys
include_sys_HEADERS = sys/buf.h sys/callout.h sys/conf.h sys/domain.h \
sys/kernel.h sys/libkern.h sys/malloc.h sys/mbuf.h sys/mount.h \
sys/proc.h sys/protosw.h sys/queue.h sys/reboot.h sys/resourcevar.h \
sys/rtprio.h sys/select.h sys/signalvar.h sys/socket.h sys/socketvar.h \
sys/sysctl.h sys/syslog.h sys/systm.h sys/ttydefaults.h sys/ucred.h \
sys/uio.h sys/un.h
$(PROJECT_INCLUDE)/sys:
@$(mkinstalldirs) $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
$(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/%)
# vm
include_vmdir = $(includedir)/vm
include_vm_HEADERS = vm/vm.h vm/vm_extern.h vm/vm_kern.h vm/vm_param.h
$(PROJECT_INCLUDE)/vm:
@$(mkinstalldirs) $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/vm \
$(include_vm_HEADERS:%=$(PROJECT_INCLUDE)/%)
# ---
$(PROJECT_INCLUDE)/%.h: %.h $(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@ $(INSTALL_DATA) $< $@

View File

@@ -1,21 +0,0 @@
##
## $Id$
##
include_arpadir = $(includedir)/arpa
include_arpa_HEADERS = ftp.h inet.h nameser.h nameser_compat.h telnet.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/arpa \
$(include_arpa_HEADERS:%=$(PROJECT_INCLUDE)/arpa/%)
$(PROJECT_INCLUDE)/arpa:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/arpa/%.h: %.h
$(INSTALL_DATA) $< $@
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../automake/local.am

View File

@@ -28,11 +28,7 @@ RTEMS_CHECK_NETWORKING
# Explicitly list all Makefiles here # Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
arpa/Makefile
machine/Makefile
kern/Makefile kern/Makefile
sys/Makefile
vm/Makefile
lib/Makefile lib/Makefile
libc/Makefile libc/Makefile
net/Makefile net/Makefile

View File

@@ -1,21 +0,0 @@
##
## $Id$
##
include_machinedir = $(includedir)/machine
include_machine_HEADERS = conf.h cpu.h cpufunc.h endian.h in_cksum.h vmparam.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/machine \
$(include_machine_HEADERS:%=$(PROJECT_INCLUDE)/machine/%)
$(PROJECT_INCLUDE)/machine:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/machine/%.h: %.h
$(INSTALL_DATA) $< $@
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../automake/local.am

View File

@@ -1,24 +0,0 @@
##
## $Id$
##
include_sysdir = $(includedir)/sys
include_sys_HEADERS = buf.h callout.h conf.h domain.h kernel.h libkern.h \
malloc.h mbuf.h mount.h proc.h protosw.h queue.h reboot.h \
resourcevar.h rtprio.h select.h signalvar.h socket.h socketvar.h \
sysctl.h syslog.h systm.h ttydefaults.h ucred.h \
uio.h un.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

View File

@@ -1,23 +0,0 @@
##
## $Id$
##
include_vmdir = $(includedir)/vm
include_vm_HEADERS = vm.h vm_extern.h vm_kern.h vm_param.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/vm \
$(include_vm_HEADERS:%=$(PROJECT_INCLUDE)/vm/%)
$(PROJECT_INCLUDE)/vm:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/vm/%.h: %.h
$(INSTALL_DATA) $< $@
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../automake/local.am