|
Message
From: OpenCores CVS Agent<cvs@o...>
Date: Thu Jan 27 15:02:12 CET 2005
Subject: [cvs-checkins] MODIFIED: or1k ...
Date: 00/05/01 27:15:02 Modified: or1k/or1ksim configure.in
Log:
Fix out-of-tree builds
Revision Changes Path
1.42 +8 -7 or1k/or1ksim/configure.in
http://www.opencores.org/cvsweb.shtml/or1k/or1ksim/configure.in.diff?r1=1.41&r2=1.42
(In the diff below, changes in quantity of whitespace are not shown.)
Index: configure.in
===================================================================
RCS file: /cvsroot/nogj/or1k/or1ksim/configure.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- configure.in 20 Oct 2004 16:02:14 -0000 1.41
+++ configure.in 27 Jan 2005 14:02:08 -0000 1.42
@@ -108,12 +108,13 @@
AC_MSG_RESULT(${enable_fsim-no})
simple_execution="0"
+INCLUDES="-I\${top_builddir}/cpu/$CPU_ARCH"
AC_MSG_CHECKING(whether to use simple execution)
AC_ARG_ENABLE(simple,
[ --enable-simple compiles sim with simple execution], [
case "$enableval" in
- no) simple_execution="0" ;;
- yes) simple_execution="1" ;;
+ no) INCLUDES="-I\${top_builddir}/cpu/$CPU_ARCH" simple_execution="0" ;;
+ yes) INCLUDES="-I\${top_srcdir}/cpu/$CPU_ARCH" simple_execution="1" ;;
esac
])
AC_MSG_RESULT(${enable_simple-no})
@@ -218,12 +219,12 @@
AC_DEFINE(HAS_DEBUG)
dnl yuck
-INCLUDES="-I\${top_srcdir} -I\${top_srcdir}/cpu/common -I\${top_srcdir}/cpu/or1k \
--I\${top_srcdir}/cpu/$CPU_ARCH -I\${top_srcdir}/cache -I\${top_srcdir}/mmu \
+INCLUDES="$INCLUDES -I\${top_srcdir} -I\${top_srcdir}/cpu/common \
+-I\${top_srcdir}/cpu/or1k -I\${top_srcdir}/cache -I\${top_srcdir}/mmu \
-I\${top_srcdir}/bpb -I\${top_srcdir}/peripheral -I\${top_srcdir}/tick \
--I\${top_srcdir}/peripheral/channels \
--I\${top_srcdir}/pm -I\${top_srcdir}/pic -I\${top_srcdir}/debug \
--I\${top_srcdir}/vapi -I\${top_srcdir}/support -I\${top_srcdir}/cuc"
+-I\${top_srcdir}/peripheral/channels -I\${top_srcdir}/pm -I\${top_srcdir}/pic \
+-I\${top_srcdir}/debug -I\${top_srcdir}/vapi -I\${top_srcdir}/support \
+-I\${top_srcdir}/cuc"
AC_SUBST(INCLUDES)
AC_OUTPUT([Makefile bpb/Makefile cache/Makefile cpu/Makefile
|
 |
Browse
