Makefile.am: add CDIO_ to all #defines in cdio_config.h

extract.c: give filename on extract errors and convert encoding to unix.
This commit is contained in:
R. Bernstein
2012-03-04 13:38:35 -05:00
parent 8eabfdd37a
commit 39bd8104b8
2 changed files with 306 additions and 305 deletions

View File

@@ -19,10 +19,10 @@
#
cdio_config.h: $(top_builddir)/config.h
echo '#ifndef __CDIO_CONFIG_H__' > cdio_config.h
echo '#define __CDIO_CONFIG_H__' >> cdio_config.h
cat $(top_builddir)/config.h >>cdio_config.h
echo '#endif /* #ifndef CDIO_CONFIG_H */' >>cdio_config.h
@echo '#ifndef __CDIO_CONFIG_H__' > cdio_config.h
@echo '#define __CDIO_CONFIG_H__' >> cdio_config.h
@@SED@ -re 's/^(#[ \t]*define) /\1 CDIO_/' $(top_builddir)/config.h >>cdio_config.h
@echo '#endif /* #ifndef CDIO_CONFIG_H */' >>cdio_config.h
libcdioincludedir=$(includedir)/cdio
dist_libcdioinclude_HEADERS = \
@@ -30,7 +30,6 @@ dist_libcdioinclude_HEADERS = \
bytesex.h \
bytesex_asm.h \
cdio.h \
cdio_unconfig.h \
cd_types.h \
cdtext.h \
device.h \