claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

test/Makefile.am: test example files, some of which are used in tests, is no longer optional

Browse Source 
other Makefile.am: remove some cruft.
This commit is contained in:
rocky
2012-03-25 20:11:11 -04:00
parent eb990be1a6
commit aa0c1cb2a3
5 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@@ -1,4 +1,4 @@
# Copyright (C) 2003, 2004, 2006, 2008, 2011 # Copyright (C) 2003, 2004, 2006, 2008, 2011, 2012
# Rocky Bernstein <rocky@gnu.org> # Rocky Bernstein <rocky@gnu.org>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
@@ -116,7 +116,6 @@ check_iso.sh: $(top_builddir)/config.status check_iso.sh.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
chmod +x config_iso.sh chmod +x config_iso.sh
# cvs2cl
MAINTAINERCLEANFILES = ChangeLog *.rej *.orig MAINTAINERCLEANFILES = ChangeLog *.rej *.orig
if MAINTAINER_MODE if MAINTAINER_MODE

1
configure.ac
View File

@@ -648,7 +648,6 @@ AC_CONFIG_FILES([
lib/udf/Makefile \ lib/udf/Makefile \
libcdio.pc \ libcdio.pc \
libcdio++.pc \ libcdio++.pc \
libcdtext.pc \
libiso9660.pc \ libiso9660.pc \
libiso9660++.pc \ libiso9660++.pc \
libudf.pc \ libudf.pc \

46
example/Makefile.am
View File

@@ -22,18 +22,35 @@ if ENABLE_CPP
SUBDIRS = C++ SUBDIRS = C++
endif endif
if BUILD_EXAMPLES noinst_PROGRAMS = \
audio cdchange cdio-eject cdtext device \ audio \
discid drives eject \ cdchange \
extract isofile isofile2 isofuzzy isolist isolsn \ cdio-eject \
mmc1 mmc2 mmc2a mmc3 \ cdtext \
sample3 sample4 tracks udf1 udffile device \
endif 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 check_PROGRAMS = cdtext device drives \
noinst_PROGRAMS = extract $(noinst_programs) mmc1 mmc2 mmc2a mmc3 sample4
INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) INCLUDES = $(LIBCDIO_CFLAGS)
audio_DEPENDENCIES = $(LIBCDIO_DEPS) audio_DEPENDENCIES = $(LIBCDIO_DEPS)
audio_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) audio_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV)
@@ -41,6 +58,9 @@ audio_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV)
cdchange_DEPENDENCIES = $(LIBCDIO_DEPS) cdchange_DEPENDENCIES = $(LIBCDIO_DEPS)
cdchange_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) cdchange_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV)
cdio_eject_DEPENDENCIES = $(LIBCDIO_DEPS)
cdio_eject_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV)
cdtext_DEPENDENCIES = $(LIBCDIO_DEPS) cdtext_DEPENDENCIES = $(LIBCDIO_DEPS)
cdtext_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) cdtext_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV)
@@ -59,9 +79,6 @@ eject_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV)
extract_DEPENDENCIES = $(LIBISO9660_LIBS) $(LIBUDF_LIBS) $(LIBCDIO_DEPS) extract_DEPENDENCIES = $(LIBISO9660_LIBS) $(LIBUDF_LIBS) $(LIBCDIO_DEPS)
extract_LDADD = $(LIBISO9660_LIBS) $(LIBUDF_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) 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) isofile_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
isofile2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) isofile2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
isofuzzy_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_DEPENDENCIES = $(LIBUDF_LIBS) $(LIBCDIO_DEPS)
udffile_LDADD = $(LIBUDF_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) udffile_LDADD = $(LIBUDF_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
check_PROGRAMS = cdtext device drives \
mmc1 mmc2 mmc2a mmc3 sample4
TESTS = $(check_PROGRAMS) TESTS = $(check_PROGRAMS)
# iso programs create file "copying" # iso programs create file "copying"

2
test/Makefile.am
View File

@@ -31,7 +31,7 @@ hack = check_sizeof testassert testgetdevices testischar \
EXTRA_PROGRAMS = testdefault EXTRA_PROGRAMS = testdefault
DATA_DIR = @abs_top_srcdir@/test/data DATA_DIR = @abs_top_srcdir@/test/data
INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) INCLUDES = $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS)
check_sizeof_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) check_sizeof_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
testassert_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV) testassert_LDADD = $(LIBCDIO_LIBS) $(LTLIBICONV)

4
test/driver/Makefile.am
View File

@@ -1,4 +1,4 @@
# Copyright (C) 2009, 2010 Rocky Bernstein <rocky@gnu.org> # Copyright (C) 2009, 2010, 2012 Rocky Bernstein <rocky@gnu.org>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) INCLUDES = $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS)
DATA_DIR = $(abs_top_srcdir)/test/data DATA_DIR = $(abs_top_srcdir)/test/data
abs_path_SOURCES = abs_path.c abs_path_SOURCES = abs_path.c