comparison Makefile @ 26588:836862767447

Introduce TEST_OBJS variable for objects to link all test files against and share it with the tools.
author diego
date Wed, 30 Apr 2008 17:51:45 +0000
parents eb5b003d247a
children 47f08d44cfa7
comparison
equal deleted inserted replaced
26587:eb5b003d247a 26588:836862767447
792 VIDIX_DEPS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.d)) 792 VIDIX_DEPS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.d))
793 VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o)) 793 VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o))
794 794
795 $(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES) 795 $(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES)
796 796
797 TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm
798
797 liba52/test$(EXESUF): liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) 799 liba52/test$(EXESUF): liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o))
798 800
799 libvo/aspecttest$(EXESUF): libvo/aspecttest.c libvo/aspect.o libvo/geometry.o mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm 801 libvo/aspecttest$(EXESUF): libvo/aspecttest.c libvo/aspect.o libvo/geometry.o $(TEST_OBJS)
800 802
801 LOADER_TEST_OBJS = $(filter loader/%,$(SRCS_COMMON:.c=.o)) libmpdemux/aviprint.o cpudetect.o mp_msg-mencoder.o mp_fifo.o osdep/mmap_anon.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm 803 LOADER_TEST_OBJS = $(filter loader/%,$(SRCS_COMMON:.c=.o)) libmpdemux/aviprint.o osdep/mmap_anon.o cpudetect.o $(TEST_OBJS)
802 804
803 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g 805 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g
804 loader/qtx/list$(EXESUF): loader/qtx/list.c $(LOADER_TEST_OBJS) 806 loader/qtx/list$(EXESUF): loader/qtx/list.c $(LOADER_TEST_OBJS)
805 loader/qtx/qtxload$(EXESUF): loader/qtx/qtxload.c $(LOADER_TEST_OBJS) 807 loader/qtx/qtxload$(EXESUF): loader/qtx/qtxload.c $(LOADER_TEST_OBJS)
806 808
807 mp3lib/test$(EXESUF): mp3lib/test.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o mp_msg-mencoder.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) -ltermcap -lm 809 mp3lib/test$(EXESUF): mp3lib/test.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o $(TEST_OBJS)
808 mp3lib/test2$(EXESUF): mp3lib/test2.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o mp_msg-mencoder.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) -ltermcap -lm 810 mp3lib/test2$(EXESUF): mp3lib/test2.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o $(TEST_OBJS)
809 811
810 TESTS = liba52/test$(EXESUF) libvo/aspecttest$(EXESUF) \ 812 TESTS = liba52/test$(EXESUF) libvo/aspecttest$(EXESUF) \
811 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF) \ 813 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF) \
812 mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF) 814 mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF)
813 815
925 TOOLS/netstream$(EXESUF) \ 927 TOOLS/netstream$(EXESUF) \
926 928
927 tools: $(TOOLS) 929 tools: $(TOOLS)
928 alltools: $(ALLTOOLS) 930 alltools: $(ALLTOOLS)
929 931
930 TOOLS_COMMON_LIBS = mp_msg-mencoder.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) \
931 -ltermcap -lm
932
933 TOOLS/bmovl-test$(EXESUF): TOOLS/bmovl-test.c -lSDL_image 932 TOOLS/bmovl-test$(EXESUF): TOOLS/bmovl-test.c -lSDL_image
934 933
935 TOOLS/subrip$(EXESUF): TOOLS/subrip.c vobsub.o spudec.o unrar_exec.o \ 934 TOOLS/subrip$(EXESUF): TOOLS/subrip.c vobsub.o spudec.o unrar_exec.o \
936 libvo/aclib.o libswscale/libswscale.a libavutil/libavutil.a \ 935 libvo/aclib.o libswscale/libswscale.a libavutil/libavutil.a \
937 $(TOOLS_COMMON_LIBS) 936 $(TEST_OBJS)
938 937
939 TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32 938 TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32
940 939
941 #FIXME: Linking is broken, help welcome. 940 #FIXME: Linking is broken, help welcome.
942 TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(TOOLS_COMMON_LIBS) 941 TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(TEST_OBJS)
943 942
944 fastmemcpybench: TOOLS/fastmemcpybench.c 943 fastmemcpybench: TOOLS/fastmemcpybench.c
945 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF) -DNAME=\"mmx\" -DHAVE_MMX 944 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF) -DNAME=\"mmx\" -DHAVE_MMX
946 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k6$(EXESUF) -DNAME=\"k6\ \" -DHAVE_MMX -DHAVE_3DNOW 945 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k6$(EXESUF) -DNAME=\"k6\ \" -DHAVE_MMX -DHAVE_3DNOW
947 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k7$(EXESUF) -DNAME=\"k7\ \" -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2 946 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k7$(EXESUF) -DNAME=\"k7\ \" -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2
964 # FIXME: netstream linking is a mess that should be fixed properly some day. 963 # FIXME: netstream linking is a mess that should be fixed properly some day.
965 # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled. 964 # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled.
966 NETSTREAM_DEPS = libavutil/libavutil.a \ 965 NETSTREAM_DEPS = libavutil/libavutil.a \
967 m_option.o \ 966 m_option.o \
968 m_struct.o \ 967 m_struct.o \
969 $(TOOLS_COMMON_LIBS) 968 $(TEST_OBJS)
970 969
971 TOOLS/netstream$(EXESUF): TOOLS/netstream.o $(NETSTREAM_DEPS) 970 TOOLS/netstream$(EXESUF): TOOLS/netstream.o $(NETSTREAM_DEPS)
972 $(CC) $(CFLAGS) -o $@ $^ 971 $(CC) $(CFLAGS) -o $@ $^
973 972
974 toolsclean: 973 toolsclean: