diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-07-30 17:52:50 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-07-30 17:52:50 +0000 |
| commit | 1896a650fc382d343844b56f4b79efe31562755e (patch) | |
| tree | 922de4dd1237cfcf6c7be0a8050e1e964fceadad /c/src/libmisc/monitor | |
| parent | Fixed typos. (diff) | |
| download | rtems-1896a650fc382d343844b56f4b79efe31562755e.tar.bz2 | |
Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
The main topic is replacing the hard-coded values for HAS_MP and
HAS_RDBG in custom/*.cfg with per-bsp configuration-time autoconf checks
(This is the patch I had mentioned before earlier this week).
CHANGES
* HAS_MP removed from custom/*.cfg, replaced with configuration time
autoconf check
* HAS_RDBG removed from custom/*.cfg, replaced with configuration-time
autoconf check
* NEW: c/src/make/bsp.cfg.in, takes configuration-time checked per-bsp
values (i.e. HAS_MP, HAS_RDBG), gets installed as
$(prefix)/<bsp>/make/bsp.cfg
* NEW: default.cfg includes bsp.cfg - this change is backward
compatible.
* IMPORT_SRC: apply VPATH instead for ts_386ex/i386ex subdirectory
Makefile.ins
* HACK: a bug in acpolish mis-handles addtions to makefile variables
which are enclosed in gmake conditionals:
c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in
* Apply inline_dir, HAS_MP and HAS_RDBG for avoiding configuration of
unneeded subdirectories in various configure.in files.
* Several minor changes in Makefile.ins and configure.ins, wrt. to the
order of including *.cfg and defining Makefile variables
APPLYING THE PATCH:
patch -p1 < rtems-rc-19990709-4.diff
./autogen
Diffstat (limited to 'c/src/libmisc/monitor')
| -rw-r--r-- | c/src/libmisc/monitor/Makefile.in | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/c/src/libmisc/monitor/Makefile.in b/c/src/libmisc/monitor/Makefile.in index 284f2606e1..9b17db0604 100644 --- a/c/src/libmisc/monitor/Makefile.in +++ b/c/src/libmisc/monitor/Makefile.in @@ -13,6 +13,17 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(RTEMS_ROOT)/make/lib.cfg + +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + LIB = ${ARCH}/libmonitor-tmp.a # C source names, if any, go here -- minus the .c @@ -32,17 +43,6 @@ INSTALLED_H_FILES = $(srcdir)/monitor.h $(srcdir)/symbols.h SRCS = README $(C_FILES) $(H_FILES) $(INSTALLED_H_FILES) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ -mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs - -INSTALLDIRS = $(PROJECT_INCLUDE)/rtems - -$(INSTALLDIRS): - @$(mkinstalldirs) $(INSTALLDIRS) - # # (OPTIONAL) Add local stuff here using += # |