projects
/
cacao.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9da2134
)
Build a libcacao.a to overcome linker resolving issues.
author
twisti
<none@none>
Thu, 10 Feb 2005 09:54:39 +0000
(09:54 +0000)
committer
twisti
<none@none>
Thu, 10 Feb 2005 09:54:39 +0000
(09:54 +0000)
src/cacao/Makefile.am
patch
|
blob
|
history
diff --git
a/src/cacao/Makefile.am
b/src/cacao/Makefile.am
index e39bc42f53f502d8faa5c8470a99d544c47f73ca..344e4adcd2b8543c4017ac3c2b2c4e5798067c22 100644
(file)
--- a/
src/cacao/Makefile.am
+++ b/
src/cacao/Makefile.am
@@
-28,7
+28,7
@@
##
## Changes:
##
##
## Changes:
##
-## $Id: Makefile.am 1
884 2005-01-24 16:58:55
Z twisti $
+## $Id: Makefile.am 1
908 2005-02-10 09:54:39
Z twisti $
## Process this file with automake to produce Makefile.in
## Process this file with automake to produce Makefile.in
@@
-71,6
+71,17
@@
cacao_LDFLAGS += \
-lgthread-2.0 -lart_lgpl_2
endif
-lgthread-2.0 -lart_lgpl_2
endif
+noinst_LTLIBRARIES = libcacao.la
+
+libcacao_la_SOURCES =
+
+libcacao_la_LIBADD = \
+ $(top_builddir)/src/mm/libmm.la \
+ $(top_builddir)/src/native/libnative.la \
+ $(THREAD_LIB) \
+ $(top_builddir)/src/toolbox/libtoolbox.la \
+ $(top_builddir)/src/vm/libvm.la
+
bindir = $(prefix)/jre/bin
bin_PROGRAMS = cacao
bindir = $(prefix)/jre/bin
bin_PROGRAMS = cacao
@@
-79,13
+90,8
@@
cacao_SOURCES = \
cacao.c \
cacao.h
cacao.c \
cacao.h
-# This order is crucial. Don't change it!
cacao_LDADD = \
cacao_LDADD = \
- $(top_builddir)/src/mm/libmm.la \
- $(THREAD_LIB) \
- $(top_builddir)/src/vm/libvm.la \
- $(top_builddir)/src/native/libnative.la \
- $(top_builddir)/src/toolbox/libtoolbox.la \
+ libcacao.la \
$(top_builddir)/src/boehm-gc/libgc.la \
$(CLASSPATH_LIBS)
$(top_builddir)/src/boehm-gc/libgc.la \
$(CLASSPATH_LIBS)