aboutsummaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ChangeLog7
-rw-r--r--src/lib/Makefile.in9
-rw-r--r--src/lib/Makefile.pamphlet9
3 files changed, 11 insertions, 14 deletions
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index cb5b0396..8bcace53 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * Makefile.pamphlet ($(axiom_target_libdir)/libspad.la): Remove
+ prerequisite mk-target-libdir.
+ (mk-target-libdir): Remove.
+ * Makefile.in: Regenerate.
+
2007-07-27 Gabriel Dos Reis <gdr@cs.tamu.edu>
* Makefile.pamphlet: Partially rework, taking advantage of libtool.
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 8a22fe97..09d7ea2b 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -41,13 +41,8 @@ stamp: $(axiom_target_libdir)/libspad.la
rm -f stamp
$(STAMP) stamp
-.PHONY: mk-target-libdir
-mk-target-libdir:
- [ -d $(axiom_target_libdir) ] \
- || $(mkinstalldirs) $(axiom_target_libdir)
-
-
-$(axiom_target_libdir)/libspad.la: $(libspad_la_objects) mk-target-libdir
+$(axiom_target_libdir)/libspad.la: $(libspad_la_objects)
+ $(mkinstalldirs) $(axiom_target_libdir)
$(LIBTOOL) --mode=link $(CC) -o $@ $(libspad_la_objects) \
-rpath $(libdir)/axiom/target/$(target)/lib
diff --git a/src/lib/Makefile.pamphlet b/src/lib/Makefile.pamphlet
index 3f2f37ac..6b0b0433 100644
--- a/src/lib/Makefile.pamphlet
+++ b/src/lib/Makefile.pamphlet
@@ -173,13 +173,8 @@ stamp: $(axiom_target_libdir)/libspad.la
rm -f stamp
$(STAMP) stamp
-.PHONY: mk-target-libdir
-mk-target-libdir:
- [ -d $(axiom_target_libdir) ] \
- || $(mkinstalldirs) $(axiom_target_libdir)
-
-
-$(axiom_target_libdir)/libspad.la: $(libspad_la_objects) mk-target-libdir
+$(axiom_target_libdir)/libspad.la: $(libspad_la_objects)
+ $(mkinstalldirs) $(axiom_target_libdir)
$(LIBTOOL) --mode=link $(CC) -o $@ $(libspad_la_objects) \
-rpath $(libdir)/axiom/target/$(target)/lib