Merge branch 'org.openembedded.dev' of git@git.openembedded.net:/openembedded into...
[vuplus_openembedded] / packages / libcdio / libcdio / libcdio-0.80-minimal-new.patch
1 Index: libcdio-0.80/cdtextinfo/Makefile.am
2 ===================================================================
3 --- libcdio-0.80/src/Makefile.am 2008-03-15 16:21:28.000000000 +0000                                                                          
4 +++ libcdio-0.80/src/Makefile.am 2008-07-25 17:16:18.000000000 +0000
5 @@ -21,11 +21,6 @@
6  
7  GETOPT_C = getopt.c getopt1.c
8  
9 -man_MANS = cd-drive.1 cd-info.1 cd-read.1 iso-read.1 iso-info.1 
10 -EXTRA_DIST = cd-drive.help2man cd-info.help2man cd-read.help2man \
11 -            iso-info.help2man iso-read.help2man $(GETOPT_C) getopt.h \
12 -             $(man_MANS)
13 -
14  noinst_HEADERS = cddb.h getopt.h util.h
15  
16  ####################################################
17 @@ -39,10 +34,6 @@
18  CDDB_LIBS=@CDDB_LIBS@
19  CDDA_PLAYER_LIBS=@CDDA_PLAYER_LIBS@
20  
21 -$(man_MANS): %.1: % %.help2man
22 -       -$(HELP2MAN) --opt-include=$<.help2man --no-info --output=$@ ./$<
23 -MOSTLYCLEANFILES = $(man_MANS)
24 -
25  if BUILD_CDDA_PLAYER
26  cdda_player_SOURCES = cdda-player.c cddb.c cddb.h $(GETOPT_C)
27  cdda_player_LDADD   = $(LIBCDIO_LIBS) $(CDDB_LIBS) $(CDDA_PLAYER_LIBS)
28 @@ -53,12 +44,14 @@
29  cd_drive_SOURCES = cd-drive.c util.c util.h $(GETOPT_C)
30  cd_drive_LDADD   =  $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
31  bin_cd_drive     = cd-drive
32 +man_cd_drive     = cd-drive.1
33  endif
34  
35  if BUILD_CDINFO
36  cd_info_SOURCES = cd-info.c cddb.c cddb.h util.c util.h $(GETOPT_C)
37  cd_info_LDADD   =  $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(CDDB_LIBS) $(VCDINFO_LIBS) $(LIBICONV)
38  bin_cd_info     = cd-info 
39 +man_cd_info     = cd-info.1
40  endif
41  
42  if BUILD_CDINFO_LINUX
43 @@ -71,24 +64,36 @@
44  cd_read_SOURCES = cd-read.c util.c util.h $(GETOPT_C)
45  cd_read_LDADD   = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
46  bin_cd_read     = cd-read 
47 +man_cd_read     = cd-read.1
48  endif
49  
50  if BUILD_ISO_INFO
51  iso_info_SOURCES = iso-info.c util.c util.h $(GETOPT_C)
52  iso_info_LDADD   = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
53  bin_iso_info     = iso-info
54 +man_iso_info     = iso-info.1
55  endif
56  
57  if BUILD_ISO_READ
58  iso_read_SOURCES = iso-read.c util.c util.h $(GETOPT_C)
59  iso_read_LDADD   = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
60  bin_iso_read     = iso-read
61 +man_iso_read     = iso-read.1
62  endif
63  
64 -mmc_tool_SOURCES = mmc-tool.c util.c util.h $(GETOPT_C)
65 -mmc_tool_LDADD   = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
66 -bin_mmc_tool     = mmc-tool
67 +#mmc_tool_SOURCES = mmc-tool.c util.c util.h $(GETOPT_C)
68 +#mmc_tool_LDADD   = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
69 +#bin_mmc_tool     = mmc-tool
70  
71  bin_PROGRAMS = $(bin_cd_drive) $(bin_cd_info)  $(bin_cdinfo_linux) $(bin_cd_read) $(bin_iso_info) $(bin_iso_read) $(bin_cdda_player) $(bin_mmc_tool)
72  
73  INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) $(VCDINFO_CFLAGS) $(CDDB_CFLAGS)
74 +
75 +man_MANS = $(man_cd_drive) $(man_cd_info) $(man_cd_read) $(man_iso_read) $(man_iso_info)
76 +EXTRA_DIST = cd-drive.help2man cd-info.help2man cd-read.help2man \
77 +             iso-info.help2man iso-read.help2man $(GETOPT_C) getopt.h \
78 +             $(man_MANS)
79 +
80 +$(man_MANS): %.1: % %.help2man
81 +        -$(HELP2MAN) --opt-include=$<.help2man --no-info --output=$@ ./$<
82 +MOSTLYCLEANFILES = $(man_MANS)