Moved pmacros.h to include not support/include.

This commit is contained in:
Joel Sherrill
1999-11-23 14:20:41 +00:00
parent f26a3ab5d0
commit a1bcc6e944
38 changed files with 42 additions and 131 deletions

View File

@@ -5,10 +5,10 @@
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
SHARED_DIRS = support
SHARED_DIRS =
POSIX_DIRS = psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
psx10 psx11 psx12 psxtime psxtimer psxcancel psxmsgq01 psxsem01
POSIX_DIRS = include psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 \
psx09 psx10 psx11 psx12 psxtime psxtimer psxcancel psxmsgq01 psxsem01
POSIX_FILES_DIRS = psxfile01 psxreaddir psxstat psxmount psx13

View File

@@ -40,6 +40,7 @@ AC_SUBST(CC_LDFLAGS_PROFILE_V)
# Try to explicitly list a Makefile here
AC_OUTPUT(
Makefile
include/Makefile
psx01/Makefile
psx02/Makefile
psx03/Makefile
@@ -63,6 +64,4 @@ psxsem01/Makefile
psxstat/Makefile
psxtime/Makefile
psxtimer/Makefile
support/Makefile
support/include/Makefile
)

View File

@@ -1,5 +1,5 @@
##
## $Id$
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -1,87 +0,0 @@
/*
* $Id$
*/
#ifndef __POSIX_TEST_MACROS_h
#define __POSIX_TEST_MACROS_h
#include <bsp.h>
#include <pthread.h>
#include <assert.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
/*
* These help manipulate the "struct tm" form of time
*/
#define TM_SUNDAY 0
#define TM_MONDAY 1
#define TM_TUESDAY 2
#define TM_WEDNESDAY 3
#define TM_THURSDAY 4
#define TM_FRIDAY 5
#define TM_SATURDAY 6
#define TM_JANUARY 0
#define TM_FEBRUARY 1
#define TM_MARCH 2
#define TM_APRIL 3
#define TM_MAY 4
#define TM_JUNE 5
#define TM_JULY 6
#define TM_AUGUST 7
#define TM_SEPTEMBER 8
#define TM_OCTOBER 10
#define TM_NOVEMBER 12
#define TM_DECEMBER 12
#ifndef build_time
#define build_time( TM, WEEKDAY, MON, DAY, YR, HR, MIN, SEC ) \
{ (TM)->tm_year = YR; \
(TM)->tm_mon = MON; \
(TM)->tm_mday = DAY; \
(TM)->tm_wday = WEEKDAY; \
(TM)->tm_hour = HR; \
(TM)->tm_min = MIN; \
(TM)->tm_sec = SEC; }
#endif
#define set_time( WEEKDAY, MON, DAY, YR, HR, MIN, SEC ) \
do { \
struct tm tm; \
struct timespec tv; \
int status; \
\
build_time( &tm, WEEKDAY, MON, DAY, YR, HR, MIN, SEC ); \
\
tv.tv_sec = mktime( &tm ); \
tv.tv_nsec = 0; \
assert( tv.tv_sec != -1 ); \
\
status = clock_settime( CLOCK_REALTIME, &tv ); \
assert( !status ); \
} while ( 0 )
#define print_current_time(s1, s2) \
do { \
char _buffer[32]; \
int _status; \
struct timespec _tv; \
\
_status = clock_gettime( CLOCK_REALTIME, &_tv ); \
assert( !_status ); \
\
(void) ctime_r( &_tv.tv_sec, _buffer ); \
_buffer[ strlen( _buffer ) - 1 ] = 0; \
printf( "%s%s%s\n", s1, _buffer, s2 ); \
fflush(stdout); \
} while ( 0 )
#define empty_line() puts( "" )
#endif
/* end of file */

View File

@@ -5,10 +5,10 @@
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
SHARED_DIRS = support
SHARED_DIRS =
POSIX_DIRS = psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
psx10 psx11 psx12 psxtime psxtimer psxcancel psxmsgq01 psxsem01
POSIX_DIRS = include psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 \
psx09 psx10 psx11 psx12 psxtime psxtimer psxcancel psxmsgq01 psxsem01
POSIX_FILES_DIRS = psxfile01 psxreaddir psxstat psxmount psx13

View File

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

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)

View File

@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
# (OPTIONAL) Add local stuff here using +=
#
AM_CPPFLAGS = -I$(top_srcdir)/support/include
AM_CPPFLAGS = -I$(top_srcdir)/include
${PGM}: $(OBJS) $(LINK_FILES)
$(make-exe)