- Added debian stuff in the distribution;

- workaround for the generation of decoder.png in the documentation.

- Added debian stuff in the distribution;
- workaround for the generation of decoder.png in the documentation.
292673fe · Arnaud de Bossoreille de Ribou · 8ca9983e · 292673fe · 292673fe · 292673fe
Commit 292673fe authored Apr 02, 2002 by Arnaud de Bossoreille de Ribou
10 changed files
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,5 +4,5 @@

 HEAD

-  * First public release
+  * First public release.

--- a/Makefile.am
+++ b/Makefile.am
 ## Process this file with automake to produce Makefile.in

-SUBDIRS = src examples misc doc
+SUBDIRS = src examples misc doc debian

 doc-dummy:


--- a/Makefile.in
+++ b/Makefile.in
@@ -74,15 +74,14 @@ RANLIB = @RANLIB@
 STRIP = @STRIP@
 VERSION = @VERSION@

-SUBDIRS = src examples misc doc
+SUBDIRS = src examples misc doc debian
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ./src/config.h
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
 Makefile.in NEWS aclocal.m4 config.guess config.sub configure \
-configure.in install-sh ltmain.sh missing mkinstalldirs src/config.h.in \
-src/stamp-h.in
+configure.in install-sh ltmain.sh missing mkinstalldirs


 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -106,34 +105,6 @@ config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)

-src/config.h: src/stamp-h
-	@if test ! -f $@; then \
-		rm -f src/stamp-h; \
-		$(MAKE) src/stamp-h; \
-	else :; fi
-src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=src/config.h \
-	     $(SHELL) ./config.status
-	@echo timestamp > src/stamp-h 2> /dev/null
-$(srcdir)/src/config.h.in: $(srcdir)/src/stamp-h.in
-	@if test ! -f $@; then \
-		rm -f $(srcdir)/src/stamp-h.in; \
-		$(MAKE) $(srcdir)/src/stamp-h.in; \
-	else :; fi
-$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f src/config.h
-
-maintainer-clean-hdr:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -322,33 +293,33 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
+mostlyclean-am:  mostlyclean-tags mostlyclean-generic

 mostlyclean: mostlyclean-recursive

-clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
+clean-am:  clean-tags clean-generic mostlyclean-am

 clean: clean-recursive

-distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
+distclean-am:  distclean-tags distclean-generic clean-am
 	-rm -f libtool

 distclean: distclean-recursive
 	-rm -f config.status

-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."

 maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status

-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+.PHONY: install-data-recursive uninstall-data-recursive \
+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
+uninstalldirs-recursive all-recursive check-recursive \
+installcheck-recursive info-recursive dvi-recursive \
+mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
 dvi-am dvi check check-am installcheck-am installcheck install-exec-am \

--- a/NEWS
+++ b/NEWS
 NEWS - list of user-visible changes between releases of libdvbpsi

+Version 0.1.0
+-------------
+  - First public release.
+
--- a/configure
+++ b/configure
@@ -5507,7 +5507,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"

-trap 'rm -fr `echo "Makefile src/Makefile src/tables/Makefile examples/Makefile misc/Makefile doc/Makefile src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile src/Makefile src/tables/Makefile examples/Makefile misc/Makefile doc/Makefile debian/Makefile src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF

@@ -5610,7 +5610,7 @@ EOF

 cat >> $CONFIG_STATUS <<EOF

-CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile src/tables/Makefile examples/Makefile misc/Makefile doc/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile src/tables/Makefile examples/Makefile misc/Makefile doc/Makefile debian/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ else
 fi


-AC_OUTPUT([Makefile src/Makefile src/tables/Makefile examples/Makefile misc/Makefile doc/Makefile])
+AC_OUTPUT([Makefile src/Makefile src/tables/Makefile examples/Makefile misc/Makefile doc/Makefile debian/Makefile])

 echo "
 libdvbpsi configuration

--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,6 +3,12 @@
 EXTRA_DIST=index.doxygen structure.doxygen usage.doxygen newdec.doxygen \
           decoder.dot Helvetica.ttf doxygen.cfg

-doc:
+MOSTLYCLEANFILES=decoder.png
+
+doc: decoder.png
 	doxygen doxygen.cfg
+	cp decoder.png doxygen/html
+
+decoder.png: decoder.dot
+	dot -Tpng -o $@ $<

--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -76,6 +76,8 @@ VERSION = @VERSION@

 EXTRA_DIST = index.doxygen structure.doxygen usage.doxygen newdec.doxygen            decoder.dot Helvetica.ttf doxygen.cfg

+
+MOSTLYCLEANFILES = decoder.png
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../src/config.h
 CONFIG_CLEAN_FILES = 
@@ -146,6 +148,7 @@ installdirs:


 mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@@ -181,8 +184,12 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean


-doc:
+doc: decoder.png
 	doxygen doxygen.cfg
+	cp decoder.png doxygen/html
+
+decoder.png: decoder.dot
+	dot -Tpng -o $@ $<

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

--- a/doc/decoder.dot
+++ b/doc/decoder.dot
 digraph decoder {
  "app"                 [ shape="box"
                          label="Application"
-                          color="blue4"
-                          fontname="Helvetica" ];
+                          color="blue4" ];
  "psi_dec"             [ shape="box"
                          label="PSI decoder"
-                          color="red3"
-                          fontname="Helvetica" ];
+                          color="red3" ];
  "specific_dec"        [ shape="box"
                          label="Specific decoder"
-                          color="green4"
-                          fontname="Helvetica" ];
+                          color="green4" ];

  app -> psi_dec -> specific_dec -> app
 }
--- a/doc/structure.doxygen
+++ b/doc/structure.doxygen
@@ -2,7 +2,7 @@

 <p>The PSI decoder and the specific decoder:</p>

-\dotfile decoder.dot "Decoder entities"
+<img src="decoder.png" />

 <p>Each decoder is split into two entities:</p>