qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 07:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Guess I had it pretty-much right already.

Browse source 
Rename TOPDIR to TOPSRC, can't get around requiring it and it's more
descriptive this way anyway. Also, revert the use of the m4_esyscmd()
macro in configure. It's kinda cool, but I'll come up with a better way
to do it.
This commit is contained in:
Jeff Teunissen 2010-08-22 23:53:06 -04:00
parent 16e482eb90
commit b5375449e9
3 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.67) AC_PREREQ(2.67)
dnl This is the only place where the package name and version appear dnl This is the only place where the package name and version appear
AC_INIT([QuakeForge], m4_esyscmd([git log -1 --pretty=%h HEAD | tr -d '\n'])) AC_INIT([QuakeForge], [git-master])
AM_INIT_AUTOMAKE([foreign]) AM_INIT_AUTOMAKE([foreign])
LT_INIT([win32-dll]) LT_INIT([win32-dll])
@ -126,8 +126,8 @@ else
AC_DEFINE(ENABLE_BOXCLIP, 0, [Define if you want boxclipping]) AC_DEFINE(ENABLE_BOXCLIP, 0, [Define if you want boxclipping])
fi fi
TOPDIR=`readlink -f ${srcdir}` TOPSRC=`readlink -f ${srcdir}`
AC_SUBST(TOPDIR) AC_SUBST(TOPSRC)
dnl Output files dnl Output files
m4_include(config.d/rpm.m4) m4_include(config.d/rpm.m4)

6
doc/configure.ac
View file

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59]) AC_PREREQ([2.59])
AC_INIT([QuakeForge], m4_esyscmd([git log -1 --pretty=%h HEAD | tr -d '\n'])) AC_INIT([QuakeForge], [git-master])
AC_CONFIG_SRCDIR([template.c]) AC_CONFIG_SRCDIR([template.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign]) AM_INIT_AUTOMAKE([foreign])
@ -19,8 +19,8 @@ AC_PROG_INSTALL
# Checks for library functions. # Checks for library functions.
TOPDIR=`readlink -f ${srcdir}/..` TOPSRC=`readlink -f ${srcdir}/..`
AC_SUBST(TOPDIR) AC_SUBST(TOPSRC)
AC_CONFIG_FILES([Makefile man/Makefile quakeforge.dox]) AC_CONFIG_FILES([Makefile man/Makefile quakeforge.dox])
AC_OUTPUT AC_OUTPUT

67
doc/quakeforge.dox.in
View file

@ -114,7 +114,7 @@ FULL_PATH_NAMES = YES
# If left blank the directory from which doxygen is run is used as the # If left blank the directory from which doxygen is run is used as the
# path to strip. # path to strip.
STRIP_FROM_PATH = @TOPDIR@ STRIP_FROM_PATH = @TOPSRC@
# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
# the path mentioned in the documentation of a class, which tells # the path mentioned in the documentation of a class, which tells
@ -123,7 +123,7 @@ STRIP_FROM_PATH = @TOPDIR@
# definition is used. Otherwise one should specify the include paths that # definition is used. Otherwise one should specify the include paths that
# are normally passed to the compiler using the -I flag. # are normally passed to the compiler using the -I flag.
STRIP_FROM_INC_PATH = @TOPDIR@/include STRIP_FROM_INC_PATH = @TOPSRC@/include
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
# (but less readable) file names. This can be useful is your file systems # (but less readable) file names. This can be useful is your file systems
@ -581,22 +581,22 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories # directories like "/usr/src/myproject". Separate the files or directories
# with spaces. # with spaces.
INPUT = @TOPDIR@/include INPUT = @TOPSRC@/include
INPUT += @TOPDIR@/libs INPUT += @TOPSRC@/libs
INPUT += @TOPDIR@/nq INPUT += @TOPSRC@/nq
INPUT += @TOPDIR@/qtv INPUT += @TOPSRC@/qtv
INPUT += @TOPDIR@/qw INPUT += @TOPSRC@/qw
INPUT += @TOPDIR@/tools INPUT += @TOPSRC@/tools
INPUT += @TOPDIR@/doc/bind.txt INPUT += @TOPSRC@/doc/bind.txt
INPUT += @TOPDIR@/doc/connect.txt INPUT += @TOPSRC@/doc/connect.txt
INPUT += @TOPDIR@/doc/cshifts.txt INPUT += @TOPSRC@/doc/cshifts.txt
INPUT += @TOPDIR@/doc/faq.txt INPUT += @TOPSRC@/doc/faq.txt
INPUT += @TOPDIR@/doc/mapformat.txt INPUT += @TOPSRC@/doc/mapformat.txt
INPUT += @TOPDIR@/doc/quakeforge.txt INPUT += @TOPSRC@/doc/quakeforge.txt
INPUT += @TOPDIR@/doc/qw-cap-spec.txt INPUT += @TOPSRC@/doc/qw-cap-spec.txt
INPUT += @TOPDIR@/doc/qw-download-spec.txt INPUT += @TOPSRC@/doc/qw-download-spec.txt
INPUT += @TOPDIR@/doc/surround-sound.txt INPUT += @TOPSRC@/doc/surround-sound.txt
INPUT += @TOPDIR@/doc/timestamps.txt INPUT += @TOPSRC@/doc/timestamps.txt
# This tag can be used to specify the character encoding of the source files # This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@ -625,16 +625,16 @@ RECURSIVE = YES
# excluded from the INPUT source files. This way you can easily exclude a # excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag. # subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = @TOPDIR@/tools/qfcc/source/qc-lex.c EXCLUDE = @TOPSRC@/tools/qfcc/source/qc-lex.c
EXCLUDE += @TOPDIR@/tools/qfcc/source/qc-parse.c EXCLUDE += @TOPSRC@/tools/qfcc/source/qc-parse.c
EXCLUDE += @TOPDIR@/tools/qfcc/source/qc-parse.h EXCLUDE += @TOPSRC@/tools/qfcc/source/qc-parse.h
EXCLUDE += @TOPDIR@/tools/qfcc/test EXCLUDE += @TOPSRC@/tools/qfcc/test
EXCLUDE += @TOPDIR@/tools/texpaint EXCLUDE += @TOPSRC@/tools/texpaint
EXCLUDE += @TOPDIR@/libs/video/targets/fbset_modes_l.c EXCLUDE += @TOPSRC@/libs/video/targets/fbset_modes_l.c
EXCLUDE += @TOPDIR@/libs/video/targets/fbset_modes_y.c EXCLUDE += @TOPSRC@/libs/video/targets/fbset_modes_y.c
EXCLUDE += @TOPDIR@/libs/video/targets/fbset_modes_y.h EXCLUDE += @TOPSRC@/libs/video/targets/fbset_modes_y.h
EXCLUDE += @TOPDIR@/tools/Forge EXCLUDE += @TOPSRC@/tools/Forge
EXCLUDE += @TOPDIR@/include/QF/GL EXCLUDE += @TOPSRC@/include/QF/GL
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
# directories that are symbolic links (a Unix filesystem feature) are excluded # directories that are symbolic links (a Unix filesystem feature) are excluded
@ -662,8 +662,8 @@ EXCLUDE_SYMBOLS =
# directories that contain example code fragments that are included (see # directories that contain example code fragments that are included (see
# the \include command). # the \include command).
EXAMPLE_PATH = @TOPDIR@/doc EXAMPLE_PATH = @TOPSRC@/doc
EXAMPLE_PATH += @TOPDIR@/doc/progs EXAMPLE_PATH += @TOPSRC@/doc/progs
# If the value of the EXAMPLE_PATH tag contains directories, you can use the # If the value of the EXAMPLE_PATH tag contains directories, you can use the
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
@ -683,8 +683,9 @@ EXAMPLE_RECURSIVE = NO
# directories that contain image that are included in the documentation (see # directories that contain image that are included in the documentation (see
# the \image command). # the \image command).
IMAGE_PATH = @TOPDIR@/doc IMAGE_PATH = @TOPSRC@/doc
IMAGE_PATH += @TOPDIR@/doc/progs IMAGE_PATH += @builddir@
IMAGE_PATH += @builddir@/progs
# The INPUT_FILTER tag can be used to specify a program that doxygen should # The INPUT_FILTER tag can be used to specify a program that doxygen should
# invoke to filter for each input file. Doxygen will invoke the filter program # invoke to filter for each input file. Doxygen will invoke the filter program
@ -1243,7 +1244,7 @@ SEARCH_INCLUDES = YES
# contain include files that are not input files but should be processed by # contain include files that are not input files but should be processed by
# the preprocessor. # the preprocessor.
INCLUDE_PATH = @TOPDIR@/include INCLUDE_PATH = @TOPSRC@/include
# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
# patterns (like *.h and *.hpp) to filter out the header-files in the # patterns (like *.h and *.hpp) to filter out the header-files in the