fly/flightgear
1
0
Fork 0
Code Activity

Tweaks to Gnu automake/autoconf system.

Browse source
This commit is contained in:
curt 1998-04-08 23:35:31 +00:00
parent 63488b922c
commit ff4d6034cc
5 changed files with 188 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile.am
View file

@ -1,6 +1,5 @@
includedir = ${exec_prefix}/include/private
include_HEADERS = \
EXTRA_DIST = \
config.h.in \
cmdargs.h \
fg_constants.h \
fg_limits.h \

73
Makefile.in
View file

@ -29,6 +29,7 @@ localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
DISTDIR =
@ -70,9 +71,8 @@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
VERSION = @VERSION@
includedir = ${exec_prefix}/include/private
include_HEADERS = \
EXTRA_DIST = \
config.h.in \
cmdargs.h \
fg_constants.h \
fg_limits.h \
@ -83,8 +83,6 @@ include_HEADERS = \
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
HEADERS = $(include_HEADERS)
DIST_COMMON = Makefile.am Makefile.in config.h.in stamp-h.in
@ -92,7 +90,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP = --best
all: Makefile $(HEADERS) config.h
all: Makefile config.h
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
@ -123,46 +121,9 @@ distclean-hdr:
-rm -f config.h
maintainer-clean-hdr:
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(includedir)
@list='$(include_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
$(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
done
uninstall-includeHEADERS:
@$(NORMAL_UNINSTALL)
list='$(include_HEADERS)'; for p in $$list; do \
rm -f $(DESTDIR)$(includedir)/$$p; \
done
tags: TAGS
TAGS:
ID: $(HEADERS) $(SOURCES) $(LISP)
here=`pwd` && cd $(srcdir) \
&& mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
|| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
mostlyclean-tags:
clean-tags:
distclean-tags:
-rm -f TAGS ID
maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
@ -188,18 +149,17 @@ installcheck:
install-exec:
@$(NORMAL_INSTALL)
install-data: install-includeHEADERS
install-data:
@$(NORMAL_INSTALL)
install: install-exec install-data all
@:
uninstall: uninstall-includeHEADERS
uninstall:
install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
installdirs:
$(mkinstalldirs) $(DATADIR)$(includedir)
mostlyclean-generic:
@ -216,25 +176,24 @@ distclean-generic:
maintainer-clean-generic:
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
mostlyclean: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
mostlyclean: mostlyclean-hdr mostlyclean-generic
clean: clean-hdr clean-tags clean-generic mostlyclean
clean: clean-hdr clean-generic mostlyclean
distclean: distclean-hdr distclean-tags distclean-generic clean
distclean: distclean-hdr distclean-generic clean
-rm -f config.status
-rm -f libtool
maintainer-clean: maintainer-clean-hdr maintainer-clean-tags \
maintainer-clean-generic distclean
maintainer-clean: maintainer-clean-hdr maintainer-clean-generic \
distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
uninstall-includeHEADERS install-includeHEADERS tags mostlyclean-tags \
distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
installcheck install-exec install-data install uninstall all \
installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
tags distdir info dvi installcheck install-exec install-data install \
uninstall all installdirs mostlyclean-generic distclean-generic \
clean-generic maintainer-clean-generic clean mostlyclean distclean \
maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.

214
config.h.in
View file

@ -1,70 +1,160 @@
/**************************************************************************
* config.h.in -- These are some of the defines made by autoconf
*
* Contributed by Petter Reinholdtsen <pere@games.no>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Id$
* (Log is kept at end of this file)
**************************************************************************/
/* Simulator/Include/config.h.in. Generated automatically from configure.in by autoheader. */
/* Define to empty if the keyword does not work. */
#undef const
#undef PACKAGE
#undef VERSION
#undef HAVE_LIBM
#undef HAVE_LIBX11
#undef HAVE_LIBXEXT
#undef HAVE_LIBXI
#undef HAVE_LIBXMU
#undef HAVE_LIBMESAGL
#undef HAVE_LIBMESAGL
#undef HAVE_LIBMESAGLU
#undef HAVE_LIBGLUT
/* Define if you don't have vprintf but do have _doprnt. */
#undef HAVE_DOPRNT
#undef HAVE_FCNTL_H
#undef HAVE_GETOPT_H
#undef HAVE_MALLOC_H
#undef HAVE_STDLIB_H
#undef HAVE_SYS_TIME_H
#undef HAVE_SYS_TIMEB_H
#undef HAVE_UNISTD_H
#undef HAVE_WINDOWS_H
#undef HAVE_WINBASE_H
#undef STDC_HEADERS
#undef TIME_WITH_SYS_TIME
#undef RETSIGTYPE
#undef HAVE_FTIME
#undef HAVE_GETITIMER
#undef HAVE_GETLOCALTIME
#undef HAVE_GETTIMEOFDAY
#undef HAVE_MKTIME
#undef HAVE_RAND
#undef HAVE_RANDOM
#undef HAVE_SETITIMER
#undef HAVE_SIGNAL
#undef HAVE_STRSTR
#undef HAVE_VALUES
/* Define if you have the vprintf function. */
#undef HAVE_VPRINTF
/* Define as the return type of signal handlers (int or void). */
#undef RETSIGTYPE
/* Define to `unsigned' if <sys/types.h> doesn't define. */
#undef size_t
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
/* Define if your <sys/time.h> declares struct tm. */
#undef TM_IN_SYS_TIME
/* Define if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING
/* Define to empty if the keyword does not work. */
#undef const
/* Define if you don't have vprintf but do have _doprnt. */
#undef HAVE_DOPRNT
/* Define if you have the vprintf function. */
#undef HAVE_VPRINTF
/* Define to package name */
#undef PACKAGE
/* Define as the return type of signal handlers (int or void). */
#undef RETSIGTYPE
/* Define to `unsigned' if <sys/types.h> doesn't define. */
#undef size_t
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
/* Define if your <sys/time.h> declares struct tm. */
#undef TM_IN_SYS_TIME
/* Define to version number */
#undef VERSION
/* Define if compiling on a Winbloze (95, NT, etc.) platform */
#undef WIN32
/* Define if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING
/* $Log$
/* Revision 1.1 1998/04/03 22:05:28 curt
/* Converting to Gnu autoconf system.
/*
*/
/* Define if you have the GetLocalTime function. */
#undef HAVE_GETLOCALTIME
/* Define if you have the ftime function. */
#undef HAVE_FTIME
/* Define if you have the getitimer function. */
#undef HAVE_GETITIMER
/* Define if you have the gettimeofday function. */
#undef HAVE_GETTIMEOFDAY
/* Define if you have the mktime function. */
#undef HAVE_MKTIME
/* Define if you have the rand function. */
#undef HAVE_RAND
/* Define if you have the random function. */
#undef HAVE_RANDOM
/* Define if you have the setitimer function. */
#undef HAVE_SETITIMER
/* Define if you have the signal function. */
#undef HAVE_SIGNAL
/* Define if you have the strstr function. */
#undef HAVE_STRSTR
/* Define if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
/* Define if you have the <getopt.h> header file. */
#undef HAVE_GETOPT_H
/* Define if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
/* Define if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H
/* Define if you have the <sys/timeb.h> header file. */
#undef HAVE_SYS_TIMEB_H
/* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define if you have the <values.h> header file. */
#undef HAVE_VALUES_H
/* Define if you have the <winbase.h> header file. */
#undef HAVE_WINBASE_H
/* Define if you have the <windows.h> header file. */
#undef HAVE_WINDOWS_H
/* Define if you have the GL library (-lGL). */
#undef HAVE_LIBGL
/* Define if you have the GLU library (-lGLU). */
#undef HAVE_LIBGLU
/* Define if you have the GLcore library (-lGLcore). */
#undef HAVE_LIBGLCORE
/* Define if you have the MesaGL library (-lMesaGL). */
#undef HAVE_LIBMESAGL
/* Define if you have the MesaGLU library (-lMesaGLU). */
#undef HAVE_LIBMESAGLU
/* Define if you have the X11 library (-lX11). */
#undef HAVE_LIBX11
/* Define if you have the Xext library (-lXext). */
#undef HAVE_LIBXEXT
/* Define if you have the Xi library (-lXi). */
#undef HAVE_LIBXI
/* Define if you have the Xmu library (-lXmu). */
#undef HAVE_LIBXMU
/* Define if you have the glut library (-lglut). */
#undef HAVE_LIBGLUT
/* Define if you have the m library (-lm). */
#undef HAVE_LIBM
/* Define if you have the socket library (-lsocket). */
#undef HAVE_LIBSOCKET

15
fg_constants.h
View file

@ -24,14 +24,14 @@
**************************************************************************/
#ifndef _CONSTANTS_H
#define _CONSTANTS_H
#ifndef _FG_CONSTANTS_H
#define _FG_CONSTANTS_H
#include <math.h>
/* This should be defined in the toplevel make.inc */
/* This should be defined via autoconf in configure.in */
#ifndef VERSION
#define VERSION "\"not defined\""
#endif
@ -118,13 +118,16 @@
#define DEFAULT_MODEL_HZ (DEFAULT_TIMER_HZ * DEFAULT_MULTILOOP)
#endif /* _CONSTANTS_H */
#endif /* _FG_CONSTANTS_H */
/* $Log$
/* Revision 1.2 1998/03/23 21:18:37 curt
/* Made FG_EPSILON smaller.
/* Revision 1.3 1998/04/08 23:35:32 curt
/* Tweaks to Gnu automake/autoconf system.
/*
* Revision 1.2 1998/03/23 21:18:37 curt
* Made FG_EPSILON smaller.
*
* Revision 1.1 1998/01/27 00:46:50 curt
* prepended "fg_" on the front of these to avoid potential conflicts with
* system include files.

15
fg_types.h
View file

@ -24,8 +24,8 @@
**************************************************************************/
#ifndef _TYPES_H
#define _TYPES_H
#ifndef _FG_TYPES_H
#define _FG_TYPES_H
/* A simple cartesian point */
@ -40,14 +40,17 @@ struct fgGeodeticPoint {
};
#endif /* _TYPES_H */
#endif /* _FG_TYPES_H */
/* $Log$
/* Revision 1.1 1998/01/27 00:46:51 curt
/* prepended "fg_" on the front of these to avoid potential conflicts with
/* system include files.
/* Revision 1.2 1998/04/08 23:35:33 curt
/* Tweaks to Gnu automake/autoconf system.
/*
* Revision 1.1 1998/01/27 00:46:51 curt
* prepended "fg_" on the front of these to avoid potential conflicts with
* system include files.
*
* Revision 1.2 1998/01/22 02:59:36 curt
* Changed #ifdef FILE_H to #ifdef _FILE_H
*