1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119
|
Description: debianization
Meant to maintain a minimal debian/rules, to fix warnings,
to address Debian specific stuff in general.
This is a Debian centric patch.
Origin: vendor, Debian
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2014-09-13
--- a/demosrc/Makefile.am
+++ b/demosrc/Makefile.am
@@ -6,7 +6,7 @@
endif
-AM_CFLAGS =
+AM_CFLAGS = -Wno-unused-result
tachyon_SOURCES = \
main.c \
@@ -27,6 +27,7 @@
AM_H2MFLAGS = \
--manual='Tachyon Manual' \
+ --source='Tachyon (Debian $(DEB_PKG_VERSION))' \
--help-option='-help' \
--version-option='-version' \
--no-info \
@@ -36,7 +37,7 @@
$(HELP2MAN) \
-s 1 \
$(AM_H2MFLAGS) \
- -I $(top_srcdir)/demosrc/man/$*.h2m \
+ -I $(top_srcdir)/debian/man/$*.h2m \
-n $(if $($(subst -,_,$*)_DESCRIPTION), $($(subst -,_,$*)_DESCRIPTION), "manual page for $*") \
-o $@ \
$(top_builddir)/demosrc/$<
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -2,6 +2,9 @@
# Makefile for Tachyon documentation
#
+TOPSRCDIR?=..
+PKGDOCDIR?=/usr/share/doc/tachyon
+
LATEX=latex
DVIPS=dvips
LATEX2HTML=latex2html
@@ -16,15 +19,15 @@
@echo " ps - Adobe PostScript"
@echo " pdf - Adobe PDF "
-all: tachyon.html tachyon.ps tachyon.pdf
+all: html ps pdf
ps: tachyon.ps
pdf: tachyon.pdf
-html: tachyon.html
+html: tachyon/tachyon.html
-tachyon.html :
+tachyon/tachyon.html :
rm -rf tachyon
$(LATEX2HTML) \
-local_icons \
@@ -59,7 +62,18 @@
$(PDFLATEX) tachyon
clean :
- rm -f *.aux *.dvi *.idx *.lof *.log *.lot *.pdf *.ps *.toc *.ilg *.ind
-
-
+ -rm -f *.aux *.dvi *.idx *.lof *.log *.lot *.pdf *.ps *.toc *.ilg *.ind
+distclean: clean
+ -rm tachyon.dvi
+ -rm tachyon.ps
+ -rm tachyon.pdf
+ -rm -rf tachyon
+
+check:
+
+install: all
+ mkdir -p $(DESTDIR)$(PKGDOCDIR)
+ mkdir -p $(DESTDIR)$(PKGDOCDIR)/html
+ cp -t $(DESTDIR)$(PKGDOCDIR) tachyon.dvi tachyon.ps tachyon.pdf
+ cp -t $(DESTDIR)$(PKGDOCDIR)/html tachyon/tachyon.css tachyon/*.html tachyon/*.png
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,10 @@
AM_CFLAGS = -g -Wall
-SUBDIRS = src demosrc docs
+SUBDIRS = src
+
+if LIBFLAVOUR_IS_SERIAL
+SUBDIRS += demosrc
+endif
EXTRA_DIST =
--- a/configure.ac
+++ b/configure.ac
@@ -58,9 +58,11 @@
## PNG library
PKG_CHECK_MODULES([LIBPNG],[libpng],[CPPFLAGS="$CPPFLAGS -DUSEPNG"],[AC_MSG_ERROR([unable to find libpng])])
## OpenGL
-AC_PATH_X
-AC_PATH_XTRA
+####AC_PATH_X
+####AC_PATH_XTRA
AX_CHECK_GL([:],[AC_MSG_ERROR([unable to find an OpenGL implementation])])
+X_LIBS="-lX11"
+AC_SUBST(X_LIBS)
dnl Checks for header files.
AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h])
|