more Makefile cleanup

JuliaLang · May 19, 2011 · e91b669 · e91b669
1 parent 003abc5
commit e91b669
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 22 deletions.
diff --git a/Makefile b/Makefile
@@ -8,12 +8,8 @@ debug release: %: julia-% j/pcre_h.j sys.ji custom.j
 
 julia-debug julia-release:
 	$(MAKE) -C src lib$@
-#	ln -f lib$@.$(SHLIB_EXT) libjulia.$(SHLIB_EXT)
 	$(MAKE) -C ui $@
 	ln -f $@-$(DEFAULT_REPL) julia
-#	ln -f $@-cloud .
-#	ln -f $@-readline .
-#	ln -f $@-basic .
 
 sys.ji: ./j/sysimg.j ./j/start_image.j src/boot.j src/dump.c j/*.j
 	./julia -b sysimg.j
@@ -53,8 +49,6 @@ sloccount:
 
 clean:
 	rm -f julia
-	rm -f julia-{debug,release}-{basic,cloud,readline}
-	rm -f libjulia-*.$(SHLIB_EXT)
 	rm -f j/pcre_h.j
 	rm -f *.ji
 	rm -f *~ *#

diff --git a/src/Makefile b/src/Makefile
@@ -68,7 +68,7 @@ libjulia-release.$(SHLIB_EXT): $(OBJS) $(LIBFILES)
 debug release: %: julia-%
 
 clean:
-	rm -f libjulia-*.so
+	rm -f $(JULIAHOME)/libjulia*.$(SHLIB_EXT)
 	rm -f julia_flisp.boot
 	rm -f julia_flisp.boot.inc
 	rm -f boot.j.inc

diff --git a/ui/Makefile b/ui/Makefile
@@ -27,20 +27,30 @@ debug release:
 %.do: %.c repl.h
 	$(CC) $(CFLAGS) $(DEBUGFLAGS) -c $< -o $@
 
-julia-release-basic: repl.o repl-basic.o
-	$(CC) $(SHIPFLAGS) $^ -o ../$@ $(LIBJULIA_RELEASE) $(LIBS)
-julia-debug-basic: repl.do repl-basic.do
-	$(CC) $(DEBUGFLAGS) $^ -o ../$@ $(LIBJULIA_DEBUG) $(LIBS)
-
-julia-release-readline: repl.o repl-readline.o
-	$(CC) $(SHIPFLAGS) $^ -o ../$@ $(LIBJULIA_RELEASE) $(READLINE) $(LIBS)
-julia-debug-readline: repl.do repl-readline.do
-	$(CC) $(DEBUGFLAGS) $^ -o ../$@ $(LIBJULIA_DEBUG) $(READLINE) $(LIBS)
-
-julia-release-cloud: repl.c repl-cloud.c
-	$(CC) $(SHIPFLAGS) -I$(MONGOOSE) -DCLOUD_REPL repl.c repl-cloud.c $(MONGOOSE)/mongoose.c -o ../$@ $(LIBJULIA_RELEASE) -lssl -lcrypto $(LIBS)
-julia-debug-cloud: repl.c repl-cloud.c
-	$(CC) $(DEBUGFLAGS) -I$(MONGOOSE) -DCLOUD_REPL repl.c repl-cloud.c $(MONGOOSE)/mongoose.c -o ../$@ $(LIBJULIA_DEBUG) -lssl -lcrypto $(LIBS)
+julia-release-basic: $(JULIAHOME)/julia-release-basic
+julia-debug-basic: $(JULIAHOME)/julia-debug-basic
+julia-release-readline: $(JULIAHOME)/julia-release-readline
+julia-debug-readline: $(JULIAHOME)/julia-debug-readline
+julia-release-cloud: $(JULIAHOME)/julia-release-cloud
+julia-debug-cloud: $(JULIAHOME)/julia-debug-cloud
+
+$(JULIAHOME)/julia-release-basic: repl.o repl-basic.o
+	$(CC) $(SHIPFLAGS) $^ -o $@ $(LIBJULIA_RELEASE) $(LIBS)
+$(JULIAHOME)/julia-debug-basic: repl.do repl-basic.do
+	$(CC) $(DEBUGFLAGS) $^ -o $@ $(LIBJULIA_DEBUG) $(LIBS)
+
+$(JULIAHOME)/julia-release-readline: repl.o repl-readline.o
+	$(CC) $(SHIPFLAGS) $^ -o $@ $(LIBJULIA_RELEASE) $(READLINE) $(LIBS)
+$(JULIAHOME)/julia-debug-readline: repl.do repl-readline.do
+	$(CC) $(DEBUGFLAGS) $^ -o $@ $(LIBJULIA_DEBUG) $(READLINE) $(LIBS)
+
+$(JULIAHOME)/julia-release-cloud: repl.c repl-cloud.c
+	$(CC) $(SHIPFLAGS) -I$(MONGOOSE) -DCLOUD_REPL repl.c repl-cloud.c $(MONGOOSE)/mongoose.c -o $@ $(LIBJULIA_RELEASE) -lssl -lcrypto $(LIBS)
+$(JULIAHOME)/julia-debug-cloud: repl.c repl-cloud.c
+	$(CC) $(DEBUGFLAGS) -I$(MONGOOSE) -DCLOUD_REPL repl.c repl-cloud.c $(MONGOOSE)/mongoose.c -o $@ $(LIBJULIA_DEBUG) -lssl -lcrypto $(LIBS)
 
 clean:
-	rm -f *.o *.do julia-*-basic julia-*-readline julia-*-cloud
+	rm -f *.o *.do
+	rm -f $(JULIAHOME)/julia-*-basic
+	rm -f $(JULIAHOME)/julia-*-readline
+	rm -f $(JULIAHOME)/julia-*-cloud