X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test%2Fmodule.defs;h=947bc1591a7fe2b5d8e051d756cb0be8f9cc8a86;hb=f35d39f9adca67471b72f3e47398855d51481f87;hp=c803fcb2302b989c24299aee0dd74fe50591402b;hpb=0d4f5926142be762389f82f1c560c67cfd4129b1;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/test/module.defs b/test/module.defs index c803fcb2..947bc159 100644 --- a/test/module.defs +++ b/test/module.defs @@ -14,8 +14,11 @@ TEST.libs = $(LIBHB.a) $(foreach n, \ ogg samplerate swscale theora vorbis vorbisenc x264, \ $(CONTRIB.build/)lib/lib$(n).a ) -TEST.install.exe = $(PREFIX/)bin/$(notdir $(TEST.exe)) +TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe)) +ifeq (1,$(LIBICONV.enabled)) + TEST.libs += $(CONTRIB.build/)lib/libiconv.a +endif ifeq (1,$(BZIP2.enabled)) TEST.libs += $(CONTRIB.build/)lib/libbz2.a endif @@ -37,7 +40,7 @@ TEST.GCC.I += $(LIBHB.GCC.I) ifeq ($(BUILD.system),darwin) TEST.GCC.f += IOKit CoreServices AudioToolbox - TEST.GCC.l += bz2 z + TEST.GCC.l += iconv bz2 z else ifeq ($(BUILD.system),linux) TEST.GCC.l += bz2 z pthread dl m else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))