projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Merged in twisti-branch.
[cacao.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index 69ec6f6f808e3cc03cd29910eb53c938d82d5e7b..1681eddf5b875405bdb6538e11391e928c126c52 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-22,7
+22,7
@@
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
##
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
##
-## $Id: Makefile.am 7
365 2007-02-15 19:42:1
3Z twisti $
+## $Id: Makefile.am 7
596 2007-03-28 21:05:5
3Z twisti $
## Process this file with automake to produce Makefile.in
## Process this file with automake to produce Makefile.in
@@
-49,13
+49,17
@@
THREADS_DIR = \
threads
endif
threads
endif
+if ENABLE_CACAOH
+CACAOH_DIR = \
+ cacaoh
+endif
+
# DON'T CHANGE THIS ORDER!!!
SUBDIRS = \
toolbox \
vmcore \
# DON'T CHANGE THIS ORDER!!!
SUBDIRS = \
toolbox \
vmcore \
- cacaoh \
- \
+ $(CACAOH_DIR) \
$(VM_DIR) \
native \
fdlibm \
$(VM_DIR) \
native \
fdlibm \