X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=35c582efcb699171e6b0f39fd49ff5eb1f883617;hp=7ad18db2c8c8ad02b024763154dcb2bd7bcc478f;hb=b51b4c9b265b22de0b41004fe910e25c36f893d3;hpb=f28623e0f1a387644ace978774790c74bad4e0e8 diff --git a/Makefile b/Makefile index 7ad18db..35c582e 100644 --- a/Makefile +++ b/Makefile @@ -33,12 +33,12 @@ libwing_Solaris := -Lupstream/install/sparc-sun-solaris2.7/lib/ libwing_Solaris += upstream/install/sparc-sun-solaris2.7/lib/libWINGs.a libwing_Solaris += upstream/install/sparc-sun-solaris2.7/lib/libwraster.a -Java2: build/Java2/ibex.jar -JVM:; make Java2 -Linux: ; make gcj platform=Linux link_flags="$(libwing_Linux) -lXpm -lX11 -lXext" -Solaris: ; make gcj platform=Solaris link_flags="$(libwing_Solaris) -lXpm -lX11 -lXext -lpthread" -Win32: ; make gcj platform=Win32 link_flags="-Wl,--subsystem,windows -lcomdlg32" -Darwin: ; make gcj platform=Darwin link_flags="$(darwin_linker_flags)" +Java2: build/Java2/ibex.jar +JVM:; @make Java2 +Linux: ; @make gcj platform=Linux link_flags="$(libwing_Linux) -lXpm -lX11 -lXext" +Solaris: ; @make gcj platform=Solaris link_flags="$(libwing_Solaris) -lXpm -lX11 -lXext -lpthread" +Win32: ; @make gcj platform=Win32 link_flags="-Wl,--subsystem,windows -lcomdlg32" +Darwin: ; @make gcj platform=Darwin link_flags="$(darwin_linker_flags)" darwin_libdir := upstream/install/powerpc-apple-darwin/lib darwin_linker_flags := -Wl,-dylib_file,/usr/lib/libSystem.B.dylib:$(darwin_libdir)/libSystem.B.dylib @@ -71,7 +71,7 @@ nm := upstream/install/$(target)/bin/nm jar := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar) gcj: .install_gcc-3.3_$(target) - make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform) + @make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform) include Makefile.upstream