aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-08-08 23:35:46 +0000
committerdos-reis <gdr@axiomatics.org>2008-08-08 23:35:46 +0000
commit778a23eceb2eced81dcd0d5f35664b3c43e9c66d (patch)
treea6e1226cc5c5ec60e46968e13e9a5f72a65a0237
parentc59c1cdcdf3d651acbc892b1ea0f1d56d9d8961f (diff)
downloadopen-axiom-778a23eceb2eced81dcd0d5f35664b3c43e9c66d.tar.gz
* lib/Makefile.in ($(axiom_target_libdir)/libopen-axiom-core.$(LIBEXT)): Tidy.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/lib/Makefile.in9
2 files changed, 12 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 30200632..87bce549 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
2008-08-08 Gabriel Dos Reis <gdr@cs.tamu.edu>
-
+
+ * lib/Makefile.in ($(axiom_target_libdir)/libopen-axiom-core.$(LIBEXT)): Tidy.
+
+2008-08-08 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* interp/pf2sex.boot (pfApplication2Sex): Don't transform ">",
"=>", and "<=" expressions.
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 3dde3af7..7ce00fad 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -76,11 +76,16 @@ stamp: $(oa_installed_corelib) libspad.$(LIBEXT)
rm -f stamp
$(STAMP) stamp
-$(axiom_target_libdir)/libopen-axiom-core.%: libopen-axiom-core.%
+$(axiom_target_libdir)/libopen-axiom-core.$(LIBEXT): \
+ libopen-axiom-core.$(LIBEXT)
$(mkdir_p) $(axiom_target_libdir)
cp -p $< $@
-libopen-axiom-core$(SHREXT): $(libopen_axiom_core_objects)
+# Don't put the shared lib here -- place it directly in its final home;
+# we don't want to pick it accidently.
+$(axiom_target_libdir)/libopen-axiom-core$(SHREXT): \
+ $(libopen_axiom_core_objects)
+ $(mkdir_p) $(axiom_target_libdir)
$(LINK_SHRLIB) $(oa_shrlib_flags) -o $@ \
$(libopen_axiom_core_objects) \
@axiom_c_runtime_extra@ -lm