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

src/cd-paranoia.h and include/cdio/cdio_config.h are derived files, so don't include them in the distribution.

Browse Source
This commit is contained in:
R. Bernstein
2011-10-20 21:46:29 -04:00
parent 958476abf4
commit 10ba010cb9
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/cdio/Makefile.am
View File

@@ -25,16 +25,15 @@ endif
cdio_config.h: $(top_srcdir)/config.h cdio_config.h: $(top_srcdir)/config.h
echo '#ifndef __CDIO_CONFIG_H__' > cdio_config.h echo '#ifndef __CDIO_CONFIG_H__' > cdio_config.h
echo '#define __CDIO_CONFIG_H__' >> cdio_config.h echo '#define __CDIO_CONFIG_H__' >> cdio_config.h
cat $(top_srcdir)/config.h >>cdio_config.h cat $(top_builddir)/config.h >>cdio_config.h
echo '#endif /* #ifndef CDIO_CONFIG_H */' >>cdio_config.h echo '#endif /* #ifndef CDIO_CONFIG_H */' >>cdio_config.h
libcdioincludedir=$(includedir)/cdio libcdioincludedir=$(includedir)/cdio
libcdioinclude_HEADERS = \ dist_libcdioinclude_HEADERS = \
audio.h \ audio.h \
bytesex.h \ bytesex.h \
bytesex_asm.h \ bytesex_asm.h \
cdio.h \ cdio.h \
cdio_config.h \
cdio_unconfig.h \ cdio_unconfig.h \
cd_types.h \ cd_types.h \
device.h \ device.h \
@@ -65,6 +64,8 @@ libcdioinclude_HEADERS = \
xa.h \ xa.h \
$(paranoiaheaders) $(paranoiaheaders)
nodist_libcdioinclude_HEADERS = cdio_config.h
EXTRA_DIST = version.h.in EXTRA_DIST = version.h.in
BUILT_SOURCES = version.h BUILT_SOURCES = version.h

9
src/cd-paranoia/Makefile.am
View File

@@ -1,6 +1,5 @@
# $Id: Makefile.am,v 1.27 2008/08/31 13:38:22 flameeyes Exp $ # Copyright (C) 2004, 2005, 2006, 2007, 2008,
# # Rocky Bernstein <rocky@gnu.org>
# Copyright (C) 2004, 2005, 2006, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
# Copyright (C) 1998 Monty xiphmont@mit.edu # Copyright (C) 1998 Monty xiphmont@mit.edu
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
@@ -29,16 +28,14 @@ EXTRA_DIST = usage.txt.in usage-copy.h pod2c.pl \
noinst_HEADERS = header.h report.h $(GETOPT_H) noinst_HEADERS = header.h report.h $(GETOPT_H)
cd_paranoia_SOURCES = cd-paranoia.c \ cd_paranoia_SOURCES = cd-paranoia.c \
buffering_write.c buffering_write.h \ buffering_write.c buffering_write.h \
header.c report.c usage.h utils.h version.h $(GETOPT_C) header.c report.c utils.h version.h $(GETOPT_C)
cd_paranoia_LDADD = $(LIBCDIO_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIBS) $(LTLIBICONV) cd_paranoia_LDADD = $(LIBCDIO_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIBS) $(LTLIBICONV)
cd_paranoia_DEPENDENCIES = $(LIBCDIO_DEPS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIBS) cd_paranoia_DEPENDENCIES = $(LIBCDIO_DEPS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIBS)
bin_PROGRAMS = cd-paranoia bin_PROGRAMS = cd-paranoia
INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)