summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-01-07 20:56:49 -0800
committerKeith Packard <keithp@keithp.com>2012-06-02 19:38:02 -0700
commitbb5b5312a0c6102b12f3d4710ef213f0f6c67412 (patch)
treea8ce02870c3f5109c9b1ba301b10d0caf600dea9
parentfc86ae58c3a296730fa99010cc27b8b3c2c3b780 (diff)
altosui: Clean up a few 'fat' build rules
Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--altosui/Makefile.am8
1 files changed, 6 insertions, 2 deletions
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index d494547b..1ec45c5f 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -259,7 +259,7 @@ altosui-jdb: Makefile
echo 'exec jdb -classpath "classes:libaltos:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" altosui/AltosUI "$$@"' >> $@
chmod +x $@
-libaltos.so:
+libaltos.so: build-libaltos
-rm -f "$@"
$(LN_S) libaltos/.libs/"$@" .
@@ -275,10 +275,14 @@ altos64.dll: libaltos/altos64.dll
-rm -f "$@"
$(LN_S) libaltos/"$@" .
+libaltos/.libs/libaltos.so: build-libaltos
+
libaltos/altos.dll: build-altos-dll
libaltos/altos64.dll: build-altos64-dll
+build-libaltos:
+ +cd libaltos && make libaltos.la
build-altos-dll:
+cd libaltos && make altos.dll
@@ -289,7 +293,7 @@ $(ALTOSLIB_CLASS):
-rm -f "$@"
$(LN_S) ../altoslib/"$@" .
-$(FREETTS_CLASS): ../altoslib/"$@"
+$(FREETTS_CLASS):
-rm -f "$@"
$(LN_S) "$(FREETTS)"/"$@" .