test/Makefile.am: test example files, some of which are used in tests, is no longer optional
other Makefile.am: remove some cruft.
This commit is contained in:
@@ -22,18 +22,35 @@ if ENABLE_CPP
|
||||
SUBDIRS = C++
|
||||
endif
|
||||
|
||||
if BUILD_EXAMPLES
|
||||
audio cdchange cdio-eject cdtext device \
|
||||
discid drives eject \
|
||||
extract isofile isofile2 isofuzzy isolist isolsn \
|
||||
mmc1 mmc2 mmc2a mmc3 \
|
||||
sample3 sample4 tracks udf1 udffile
|
||||
endif
|
||||
noinst_PROGRAMS = \
|
||||
audio \
|
||||
cdchange \
|
||||
cdio-eject \
|
||||
cdtext \
|
||||
device \
|
||||
discid \
|
||||
drives \
|
||||
eject \
|
||||
extract \
|
||||
isofile \
|
||||
isofile2 \
|
||||
isofuzzy \
|
||||
isolist \
|
||||
isolsn \
|
||||
mmc1 \
|
||||
mmc2 \
|
||||
mmc2a \
|
||||
mmc3 \
|
||||
sample3 \
|
||||
sample4 \
|
||||
tracks \
|
||||
udf1 \
|
||||
udffile
|
||||
|
||||
# extract is used in tests so that has to be built regardless
|
||||
noinst_PROGRAMS = extract $(noinst_programs)
|
||||
check_PROGRAMS = cdtext device drives \
|
||||
mmc1 mmc2 mmc2a mmc3 sample4
|
||||
|
||||
INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)
|
||||
INCLUDES = $(LIBCDIO_CFLAGS)
|
||||
|
||||
audio_DEPENDENCIES = $(LIBCDIO_DEPS)
|
||||
audio_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
@@ -41,6 +58,9 @@ audio_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
cdchange_DEPENDENCIES = $(LIBCDIO_DEPS)
|
||||
cdchange_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
|
||||
cdio_eject_DEPENDENCIES = $(LIBCDIO_DEPS)
|
||||
cdio_eject_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
|
||||
cdtext_DEPENDENCIES = $(LIBCDIO_DEPS)
|
||||
cdtext_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
|
||||
@@ -59,9 +79,6 @@ eject_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
extract_DEPENDENCIES = $(LIBISO9660_LIBS) $(LIBUDF_LIBS) $(LIBCDIO_DEPS)
|
||||
extract_LDADD = $(LIBISO9660_LIBS) $(LIBUDF_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
|
||||
cdio_eject_DEPENDENCIES = $(LIBCDIO_DEPS)
|
||||
cdio_eject_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
|
||||
isofile_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
isofile2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
isofuzzy_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
@@ -94,9 +111,6 @@ udf1_LDADD = $(LIBUDF_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
udffile_DEPENDENCIES = $(LIBUDF_LIBS) $(LIBCDIO_DEPS)
|
||||
udffile_LDADD = $(LIBUDF_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
|
||||
|
||||
check_PROGRAMS = cdtext device drives \
|
||||
mmc1 mmc2 mmc2a mmc3 sample4
|
||||
|
||||
TESTS = $(check_PROGRAMS)
|
||||
|
||||
# iso programs create file "copying"
|
||||
|
||||
Reference in New Issue
Block a user