RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* include/sys/Makefile.am: Remove.
	* include/rtems/Makefile.am: Remove.
	* include/rtems/posix/Makefile.am: Remove.
	* include/Makefile.am: Handle subdirs.
	* inline/rtems/Makefile.am: Remove.
	* inline/rtems/posix/Makefile.am: Remove.
	* inline/Makefile.am: Handle subdirs.
	* macros/rtems/Makefile.am: Remove.
	* macros/rtems/posix/Makefile.am: Remove.
	* macros/Makefile.am: Handle subdirs.
	* configure.ac: Reflect changes above.
This commit is contained in:
Joel Sherrill
2001-10-16 13:30:22 +00:00
parent 5a6ad2a2e9
commit 5be35eecb4
17 changed files with 202 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
c/src/exec/posix/ChangeLog
View File

@@ -1,3 +1,17 @@
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/sys/Makefile.am: Remove.
* include/rtems/Makefile.am: Remove.
* include/rtems/posix/Makefile.am: Remove.
* include/Makefile.am: Handle subdirs.
* inline/rtems/Makefile.am: Remove.
* inline/rtems/posix/Makefile.am: Remove.
* inline/Makefile.am: Handle subdirs.
* macros/rtems/Makefile.am: Remove.
* macros/rtems/posix/Makefile.am: Remove.
* macros/Makefile.am: Handle subdirs.
* configure.ac: Reflect changes above.
2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Add autom4te.cache for autoconf > 2.52. * .cvsignore: Add autom4te.cache for autoconf > 2.52.

7
c/src/exec/posix/configure.ac
View File

@@ -53,15 +53,8 @@ AM_CONFIG_HEADER(src/config.h)
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
src/Makefile src/Makefile
include/Makefile include/Makefile
include/sys/Makefile
include/rtems/Makefile
include/rtems/posix/Makefile
optman/Makefile optman/Makefile
inline/Makefile inline/Makefile
inline/rtems/Makefile
inline/rtems/posix/Makefile
macros/Makefile macros/Makefile
macros/rtems/Makefile
macros/rtems/posix/Makefile
]) ])
AC_OUTPUT AC_OUTPUT

55
c/src/exec/posix/include/Makefile.am
View File

@@ -2,8 +2,19 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/sys:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/posix:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
# include
noinst_HEADERS = devctl.h intr.h noinst_HEADERS = devctl.h intr.h
include_HEADERS = sched.h aio.h mqueue.h semaphore.h include_HEADERS = sched.h aio.h mqueue.h semaphore.h
@@ -11,16 +22,44 @@ include_HEADERS = sched.h aio.h mqueue.h semaphore.h
PREINSTALL_FILES = $(PROJECT_INCLUDE) \ PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
$(PROJECT_INCLUDE): # sys
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h include_sysdir = $(includedir)/sys
$(INSTALL_DATA) $< $@
include_sys_HEADERS = sys/utsname.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
$(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/%)
# rtems/posix
include_rtems_posixdir = $(includedir)/rtems/posix
MP_H_FILES = rtems/posix/condmp.h rtems/posix/mqueuemp.h rtems/posix/mutexmp.h \
rtems/posix/pthreadmp.h rtems/posix/semaphoremp.h
STD_H_FILES = rtems/posix/cancel.h rtems/posix/cond.h rtems/posix/config.h \
rtems/posix/key.h rtems/posix/mqueue.h rtems/posix/mutex.h \
rtems/posix/posixapi.h rtems/posix/priority.h rtems/posix/psignal.h \
rtems/posix/pthread.h rtems/posix/ptimer.h rtems/posix/semaphore.h \
rtems/posix/threadsup.h rtems/posix/time.h rtems/posix/timer.h \
$(MP_H_FILES)
noinst_HEADERS += rtems/posix/intr.h rtems/posix/threadsup.h
if HAS_MP
include_rtems_posix_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
else
include_rtems_posix_HEADERS = $(STD_H_FILES)
endif
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix \
$(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/%)
## General
all-local: $(PREINSTALL_FILES) all-local: $(PREINSTALL_FILES)
SUBDIRS = rtems sys
EXTRA_DIST = $(noinst_HEADERS) EXTRA_DIST = $(noinst_HEADERS)
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am include $(top_srcdir)/../../../../automake/local.am

10
c/src/exec/posix/include/rtems/Makefile.am
View File

@@ -1,10 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = posix
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am

35
c/src/exec/posix/include/rtems/posix/Makefile.am
View File

@@ -1,35 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_rtems_posixdir = $(includedir)/rtems/posix
MP_H_FILES = condmp.h mqueuemp.h mutexmp.h pthreadmp.h semaphoremp.h
STD_H_FILES = cancel.h cond.h config.h key.h mqueue.h mutex.h posixapi.h \
priority.h psignal.h pthread.h ptimer.h semaphore.h threadsup.h time.h \
timer.h $(MP_H_FILES)
noinst_HEADERS = intr.h threadsup.h
if HAS_MP
include_rtems_posix_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
else
include_rtems_posix_HEADERS = $(STD_H_FILES)
endif
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/posix \
$(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/rtems/posix/%)
$(PROJECT_INCLUDE)/rtems/posix:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/posix/%.h: %.h
$(INSTALL_DATA) $< $@
all-local: $(PREINSTALL_FILES)
EXTRA_DIST = $(noinst_HEADERS)
include $(top_srcdir)/../../../../automake/local.am

21
c/src/exec/posix/include/sys/Makefile.am
View File

@@ -1,21 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_sysdir = $(includedir)/sys
include_sys_HEADERS = utsname.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

23
c/src/exec/posix/inline/Makefile.am
View File

@@ -2,9 +2,26 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
SUBDIRS = rtems include_rtems_posixdir = $(includedir)/rtems/posix
$(PROJECT_INCLUDE)/rtems/posix:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%: %
$(INSTALL_DATA) $< $@
if INLINE
noinst_HEADERS = rtems/posix/intr.inl
include_rtems_posix_HEADERS = rtems/posix/cond.inl rtems/posix/key.inl \
rtems/posix/mqueue.inl rtems/posix/mutex.inl \
rtems/posix/pthread.inl rtems/posix/priority.inl \
rtems/posix/semaphore.inl rtems/posix/timer.inl
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/posix \
$(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/%)
endif
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am include $(top_srcdir)/../../../../automake/local.am

10
c/src/exec/posix/inline/rtems/Makefile.am
View File

@@ -1,10 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = posix
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am

29
c/src/exec/posix/inline/rtems/posix/Makefile.am
View File

@@ -1,29 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_rtems_posixdir = $(includedir)/rtems/posix
noinst_HEADERS = intr.inl
I_FILES = cond.inl key.inl mqueue.inl mutex.inl pthread.inl priority.inl \
semaphore.inl timer.inl
if INLINE
include_rtems_posix_HEADERS = $(I_FILES)
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/posix \
$(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/rtems/posix/%)
$(PROJECT_INCLUDE)/rtems/posix:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/posix/%.inl: %.inl
$(INSTALL_DATA) $< $@
endif
all-local: $(PREINSTALL_FILES)
EXTRA_DIST = intr.inl $(I_FILES)
include $(top_srcdir)/../../../../automake/local.am

23
c/src/exec/posix/macros/Makefile.am
View File

@@ -2,9 +2,26 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
SUBDIRS = rtems include_rtems_posixdir = $(includedir)/rtems/posix
$(PROJECT_INCLUDE)/rtems/posix:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%: %
$(INSTALL_DATA) $< $@
if MACROS
noinst_HEADERS = rtems/posix/intr.inl
include_rtems_posix_HEADERS = rtems/posix/cond.inl rtems/posix/key.inl \
rtems/posix/mqueue.inl rtems/posix/mutex.inl \
rtems/posix/pthread.inl rtems/posix/priority.inl \
rtems/posix/semaphore.inl rtems/posix/timer.inl
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/posix \
$(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/%)
endif
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am include $(top_srcdir)/../../../../automake/local.am

10
c/src/exec/posix/macros/rtems/Makefile.am
View File

@@ -1,10 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = posix
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am

28
c/src/exec/posix/macros/rtems/posix/Makefile.am
View File

@@ -1,28 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_rtems_posixdir = $(includedir)/rtems/posix
I_FILES = cond.inl intr.inl key.inl mqueue.inl mutex.inl priority.inl \
pthread.inl semaphore.inl timer.inl
if MACROS
include_rtems_posix_HEADERS = $(I_FILES)
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/posix \
$(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/rtems/posix/%)
$(PROJECT_INCLUDE)/rtems/posix:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/posix/%.inl: %.inl
$(INSTALL_DATA) $< $@
endif
all-local: $(PREINSTALL_FILES)
EXTRA_DIST = $(I_FILES)
include $(top_srcdir)/../../../../automake/local.am

14
cpukit/posix/ChangeLog
View File

@@ -1,3 +1,17 @@
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/sys/Makefile.am: Remove.
* include/rtems/Makefile.am: Remove.
* include/rtems/posix/Makefile.am: Remove.
* include/Makefile.am: Handle subdirs.
* inline/rtems/Makefile.am: Remove.
* inline/rtems/posix/Makefile.am: Remove.
* inline/Makefile.am: Handle subdirs.
* macros/rtems/Makefile.am: Remove.
* macros/rtems/posix/Makefile.am: Remove.
* macros/Makefile.am: Handle subdirs.
* configure.ac: Reflect changes above.
2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Add autom4te.cache for autoconf > 2.52. * .cvsignore: Add autom4te.cache for autoconf > 2.52.

7
cpukit/posix/configure.ac
View File

@@ -53,15 +53,8 @@ AM_CONFIG_HEADER(src/config.h)
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
src/Makefile src/Makefile
include/Makefile include/Makefile
include/sys/Makefile
include/rtems/Makefile
include/rtems/posix/Makefile
optman/Makefile optman/Makefile
inline/Makefile inline/Makefile
inline/rtems/Makefile
inline/rtems/posix/Makefile
macros/Makefile macros/Makefile
macros/rtems/Makefile
macros/rtems/posix/Makefile
]) ])
AC_OUTPUT AC_OUTPUT

55
cpukit/posix/include/Makefile.am
View File

@@ -2,8 +2,19 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/sys:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/posix:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
# include
noinst_HEADERS = devctl.h intr.h noinst_HEADERS = devctl.h intr.h
include_HEADERS = sched.h aio.h mqueue.h semaphore.h include_HEADERS = sched.h aio.h mqueue.h semaphore.h
@@ -11,16 +22,44 @@ include_HEADERS = sched.h aio.h mqueue.h semaphore.h
PREINSTALL_FILES = $(PROJECT_INCLUDE) \ PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
$(PROJECT_INCLUDE): # sys
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h include_sysdir = $(includedir)/sys
$(INSTALL_DATA) $< $@
include_sys_HEADERS = sys/utsname.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
$(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/%)
# rtems/posix
include_rtems_posixdir = $(includedir)/rtems/posix
MP_H_FILES = rtems/posix/condmp.h rtems/posix/mqueuemp.h rtems/posix/mutexmp.h \
rtems/posix/pthreadmp.h rtems/posix/semaphoremp.h
STD_H_FILES = rtems/posix/cancel.h rtems/posix/cond.h rtems/posix/config.h \
rtems/posix/key.h rtems/posix/mqueue.h rtems/posix/mutex.h \
rtems/posix/posixapi.h rtems/posix/priority.h rtems/posix/psignal.h \
rtems/posix/pthread.h rtems/posix/ptimer.h rtems/posix/semaphore.h \
rtems/posix/threadsup.h rtems/posix/time.h rtems/posix/timer.h \
$(MP_H_FILES)
noinst_HEADERS += rtems/posix/intr.h rtems/posix/threadsup.h
if HAS_MP
include_rtems_posix_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
else
include_rtems_posix_HEADERS = $(STD_H_FILES)
endif
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix \
$(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/%)
## General
all-local: $(PREINSTALL_FILES) all-local: $(PREINSTALL_FILES)
SUBDIRS = rtems sys
EXTRA_DIST = $(noinst_HEADERS) EXTRA_DIST = $(noinst_HEADERS)
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am include $(top_srcdir)/../../../../automake/local.am

23
cpukit/posix/inline/Makefile.am
View File

@@ -2,9 +2,26 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
SUBDIRS = rtems include_rtems_posixdir = $(includedir)/rtems/posix
$(PROJECT_INCLUDE)/rtems/posix:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%: %
$(INSTALL_DATA) $< $@
if INLINE
noinst_HEADERS = rtems/posix/intr.inl
include_rtems_posix_HEADERS = rtems/posix/cond.inl rtems/posix/key.inl \
rtems/posix/mqueue.inl rtems/posix/mutex.inl \
rtems/posix/pthread.inl rtems/posix/priority.inl \
rtems/posix/semaphore.inl rtems/posix/timer.inl
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/posix \
$(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/%)
endif
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am include $(top_srcdir)/../../../../automake/local.am

23
cpukit/posix/macros/Makefile.am
View File

@@ -2,9 +2,26 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
SUBDIRS = rtems include_rtems_posixdir = $(includedir)/rtems/posix
$(PROJECT_INCLUDE)/rtems/posix:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%: %
$(INSTALL_DATA) $< $@
if MACROS
noinst_HEADERS = rtems/posix/intr.inl
include_rtems_posix_HEADERS = rtems/posix/cond.inl rtems/posix/key.inl \
rtems/posix/mqueue.inl rtems/posix/mutex.inl \
rtems/posix/pthread.inl rtems/posix/priority.inl \
rtems/posix/semaphore.inl rtems/posix/timer.inl
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/posix \
$(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/%)
endif
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am include $(top_srcdir)/../../../../automake/local.am