Now using pkgconfig for library dependencies.
This commit is contained in:
parent
c3580f59f7
commit
8b4aaf4ef5
5 changed files with 4422 additions and 3801 deletions
12
Makefile.am
12
Makefile.am
|
@ -1,3 +1,9 @@
|
||||||
lib_LTLIBRARIES = libneofx.la
|
lib_LTLIBRARIES = libneofx.la
|
||||||
libneofx_la_SOURCES = math.c collision.c physics.c
|
libneofx_la_SOURCES = math.c collision.c physics.c
|
||||||
nobase_include_HEADERS = neofx/math.h neofx/collision.h neofx/types.h neofx/physics.h
|
libneofx_la_LDFLAGS = -version-info 0:0:0 -release 0.1
|
||||||
|
|
||||||
|
library_includedir = $(includedir)/libneofx-0.1/neofx
|
||||||
|
library_include_HEADERS = neofx/math.h neofx/collision.h neofx/types.h neofx/physics.h
|
||||||
|
|
||||||
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
|
pkgconfig_DATA = libneofx-0.1.pc
|
||||||
|
|
92
Makefile.in
92
Makefile.in
|
@ -65,6 +65,7 @@ EGREP = @EGREP@
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
F77 = @F77@
|
F77 = @F77@
|
||||||
FFLAGS = @FFLAGS@
|
FFLAGS = @FFLAGS@
|
||||||
|
GREP = @GREP@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||||
|
@ -92,12 +93,9 @@ SET_MAKE = @SET_MAKE@
|
||||||
SHELL = @SHELL@
|
SHELL = @SHELL@
|
||||||
STRIP = @STRIP@
|
STRIP = @STRIP@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
ac_ct_AR = @ac_ct_AR@
|
|
||||||
ac_ct_CC = @ac_ct_CC@
|
ac_ct_CC = @ac_ct_CC@
|
||||||
ac_ct_CXX = @ac_ct_CXX@
|
ac_ct_CXX = @ac_ct_CXX@
|
||||||
ac_ct_F77 = @ac_ct_F77@
|
ac_ct_F77 = @ac_ct_F77@
|
||||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
|
||||||
ac_ct_STRIP = @ac_ct_STRIP@
|
|
||||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||||
|
@ -112,37 +110,49 @@ build_cpu = @build_cpu@
|
||||||
build_os = @build_os@
|
build_os = @build_os@
|
||||||
build_vendor = @build_vendor@
|
build_vendor = @build_vendor@
|
||||||
datadir = @datadir@
|
datadir = @datadir@
|
||||||
|
datarootdir = @datarootdir@
|
||||||
|
docdir = @docdir@
|
||||||
|
dvidir = @dvidir@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
host = @host@
|
host = @host@
|
||||||
host_alias = @host_alias@
|
host_alias = @host_alias@
|
||||||
host_cpu = @host_cpu@
|
host_cpu = @host_cpu@
|
||||||
host_os = @host_os@
|
host_os = @host_os@
|
||||||
host_vendor = @host_vendor@
|
host_vendor = @host_vendor@
|
||||||
|
htmldir = @htmldir@
|
||||||
includedir = @includedir@
|
includedir = @includedir@
|
||||||
infodir = @infodir@
|
infodir = @infodir@
|
||||||
install_sh = @install_sh@
|
install_sh = @install_sh@
|
||||||
libdir = @libdir@
|
libdir = @libdir@
|
||||||
libexecdir = @libexecdir@
|
libexecdir = @libexecdir@
|
||||||
|
localedir = @localedir@
|
||||||
localstatedir = @localstatedir@
|
localstatedir = @localstatedir@
|
||||||
mandir = @mandir@
|
mandir = @mandir@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
|
pdfdir = @pdfdir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
|
psdir = @psdir@
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
sharedstatedir = @sharedstatedir@
|
sharedstatedir = @sharedstatedir@
|
||||||
sysconfdir = @sysconfdir@
|
sysconfdir = @sysconfdir@
|
||||||
target_alias = @target_alias@
|
target_alias = @target_alias@
|
||||||
lib_LTLIBRARIES = libneofx.la
|
lib_LTLIBRARIES = libneofx.la
|
||||||
libneofx_la_SOURCES = math.c collision.c physics.c
|
libneofx_la_SOURCES = math.c collision.c physics.c
|
||||||
nobase_include_HEADERS = neofx/math.h neofx/collision.h neofx/types.h neofx/physics.h
|
libneofx_la_LDFLAGS = -version-info 0:0:0 -release 0.1
|
||||||
|
|
||||||
|
library_includedir = $(includedir)/libneofx-0.1/neofx
|
||||||
|
library_include_HEADERS = neofx/math.h neofx/collision.h neofx/types.h neofx/physics.h
|
||||||
|
|
||||||
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
|
pkgconfig_DATA = libneofx-0.1.pc
|
||||||
subdir = .
|
subdir = .
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||||
CONFIG_HEADER = config.h
|
CONFIG_HEADER = config.h
|
||||||
CONFIG_CLEAN_FILES =
|
CONFIG_CLEAN_FILES = libneofx-0.1.pc
|
||||||
LTLIBRARIES = $(lib_LTLIBRARIES)
|
LTLIBRARIES = $(lib_LTLIBRARIES)
|
||||||
|
|
||||||
libneofx_la_LDFLAGS =
|
|
||||||
libneofx_la_LIBADD =
|
libneofx_la_LIBADD =
|
||||||
am_libneofx_la_OBJECTS = math.lo collision.lo physics.lo
|
am_libneofx_la_OBJECTS = math.lo collision.lo physics.lo
|
||||||
libneofx_la_OBJECTS = $(am_libneofx_la_OBJECTS)
|
libneofx_la_OBJECTS = $(am_libneofx_la_OBJECTS)
|
||||||
|
@ -160,13 +170,15 @@ CCLD = $(CC)
|
||||||
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||||
DIST_SOURCES = $(libneofx_la_SOURCES)
|
DIST_SOURCES = $(libneofx_la_SOURCES)
|
||||||
HEADERS = $(nobase_include_HEADERS)
|
DATA = $(pkgconfig_DATA)
|
||||||
|
|
||||||
DIST_COMMON = README $(nobase_include_HEADERS) $(srcdir)/Makefile.in \
|
HEADERS = $(library_include_HEADERS)
|
||||||
|
|
||||||
|
DIST_COMMON = README $(library_include_HEADERS) $(srcdir)/Makefile.in \
|
||||||
$(srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \
|
$(srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \
|
||||||
Makefile.am NEWS acinclude.m4 aclocal.m4 config.guess \
|
Makefile.am NEWS acinclude.m4 aclocal.m4 config.guess \
|
||||||
config.h.in config.sub configure configure.in depcomp \
|
config.h.in config.sub configure configure.in depcomp \
|
||||||
install-sh ltmain.sh missing mkinstalldirs
|
install-sh libneofx-0.1.pc.in ltmain.sh missing mkinstalldirs
|
||||||
SOURCES = $(libneofx_la_SOURCES)
|
SOURCES = $(libneofx_la_SOURCES)
|
||||||
|
|
||||||
all: config.h
|
all: config.h
|
||||||
|
@ -207,6 +219,8 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOC
|
||||||
|
|
||||||
distclean-hdr:
|
distclean-hdr:
|
||||||
-rm -f config.h stamp-h1
|
-rm -f config.h stamp-h1
|
||||||
|
libneofx-0.1.pc: $(top_builddir)/config.status libneofx-0.1.pc.in
|
||||||
|
cd $(top_builddir) && $(SHELL) ./config.status $@
|
||||||
libLTLIBRARIES_INSTALL = $(INSTALL)
|
libLTLIBRARIES_INSTALL = $(INSTALL)
|
||||||
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
|
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
|
||||||
@$(NORMAL_INSTALL)
|
@$(NORMAL_INSTALL)
|
||||||
|
@ -290,23 +304,41 @@ clean-libtool:
|
||||||
distclean-libtool:
|
distclean-libtool:
|
||||||
-rm -f libtool
|
-rm -f libtool
|
||||||
uninstall-info-am:
|
uninstall-info-am:
|
||||||
nobase_includeHEADERS_INSTALL = $(install_sh_DATA)
|
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
|
||||||
install-nobase_includeHEADERS: $(nobase_include_HEADERS)
|
install-pkgconfigDATA: $(pkgconfig_DATA)
|
||||||
@$(NORMAL_INSTALL)
|
@$(NORMAL_INSTALL)
|
||||||
$(mkinstalldirs) $(DESTDIR)$(includedir)
|
$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
|
||||||
@list='$(nobase_include_HEADERS)'; for p in $$list; do \
|
@list='$(pkgconfig_DATA)'; for p in $$list; do \
|
||||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||||
f="$$p"; \
|
f="`echo $$p | sed -e 's|^.*/||'`"; \
|
||||||
echo " $(nobase_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
|
echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \
|
||||||
$(nobase_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
|
$(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \
|
||||||
done
|
done
|
||||||
|
|
||||||
uninstall-nobase_includeHEADERS:
|
uninstall-pkgconfigDATA:
|
||||||
@$(NORMAL_UNINSTALL)
|
@$(NORMAL_UNINSTALL)
|
||||||
@list='$(nobase_include_HEADERS)'; for p in $$list; do \
|
@list='$(pkgconfig_DATA)'; for p in $$list; do \
|
||||||
f="$$p"; \
|
f="`echo $$p | sed -e 's|^.*/||'`"; \
|
||||||
echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
|
echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \
|
||||||
rm -f $(DESTDIR)$(includedir)/$$f; \
|
rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \
|
||||||
|
done
|
||||||
|
library_includeHEADERS_INSTALL = $(INSTALL_HEADER)
|
||||||
|
install-library_includeHEADERS: $(library_include_HEADERS)
|
||||||
|
@$(NORMAL_INSTALL)
|
||||||
|
$(mkinstalldirs) $(DESTDIR)$(library_includedir)
|
||||||
|
@list='$(library_include_HEADERS)'; for p in $$list; do \
|
||||||
|
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||||
|
f="`echo $$p | sed -e 's|^.*/||'`"; \
|
||||||
|
echo " $(library_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(library_includedir)/$$f"; \
|
||||||
|
$(library_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(library_includedir)/$$f; \
|
||||||
|
done
|
||||||
|
|
||||||
|
uninstall-library_includeHEADERS:
|
||||||
|
@$(NORMAL_UNINSTALL)
|
||||||
|
@list='$(library_include_HEADERS)'; for p in $$list; do \
|
||||||
|
f="`echo $$p | sed -e 's|^.*/||'`"; \
|
||||||
|
echo " rm -f $(DESTDIR)$(library_includedir)/$$f"; \
|
||||||
|
rm -f $(DESTDIR)$(library_includedir)/$$f; \
|
||||||
done
|
done
|
||||||
|
|
||||||
ETAGS = etags
|
ETAGS = etags
|
||||||
|
@ -379,7 +411,7 @@ distcleancheck_listfiles = find . -type f -print
|
||||||
distdir: $(DISTFILES)
|
distdir: $(DISTFILES)
|
||||||
$(am__remove_distdir)
|
$(am__remove_distdir)
|
||||||
mkdir $(distdir)
|
mkdir $(distdir)
|
||||||
$(mkinstalldirs) $(distdir)/neofx
|
$(mkinstalldirs) $(distdir)/. $(distdir)/neofx
|
||||||
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
||||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
||||||
list='$(DISTFILES)'; for file in $$list; do \
|
list='$(DISTFILES)'; for file in $$list; do \
|
||||||
|
@ -477,10 +509,10 @@ distcleancheck: distclean
|
||||||
exit 1; } >&2
|
exit 1; } >&2
|
||||||
check-am: all-am
|
check-am: all-am
|
||||||
check: check-am
|
check: check-am
|
||||||
all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
|
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h
|
||||||
|
|
||||||
installdirs:
|
installdirs:
|
||||||
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
|
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(library_includedir)
|
||||||
install: install-am
|
install: install-am
|
||||||
install-exec: install-exec-am
|
install-exec: install-exec-am
|
||||||
install-data: install-data-am
|
install-data: install-data-am
|
||||||
|
@ -525,7 +557,7 @@ info: info-am
|
||||||
|
|
||||||
info-am:
|
info-am:
|
||||||
|
|
||||||
install-data-am: install-nobase_includeHEADERS
|
install-data-am: install-library_includeHEADERS install-pkgconfigDATA
|
||||||
|
|
||||||
install-exec-am: install-libLTLIBRARIES
|
install-exec-am: install-libLTLIBRARIES
|
||||||
|
|
||||||
|
@ -556,7 +588,7 @@ ps: ps-am
|
||||||
ps-am:
|
ps-am:
|
||||||
|
|
||||||
uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
|
uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
|
||||||
uninstall-nobase_includeHEADERS
|
uninstall-library_includeHEADERS uninstall-pkgconfigDATA
|
||||||
|
|
||||||
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
|
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
|
||||||
clean-libLTLIBRARIES clean-libtool ctags dist dist-all \
|
clean-libLTLIBRARIES clean-libtool ctags dist dist-all \
|
||||||
|
@ -565,13 +597,15 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
|
||||||
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
||||||
dvi-am info info-am install install-am install-data \
|
dvi-am info info-am install install-am install-data \
|
||||||
install-data-am install-exec install-exec-am install-info \
|
install-data-am install-exec install-exec-am install-info \
|
||||||
install-info-am install-libLTLIBRARIES install-man \
|
install-info-am install-libLTLIBRARIES \
|
||||||
install-nobase_includeHEADERS install-strip installcheck \
|
install-library_includeHEADERS install-man \
|
||||||
|
install-pkgconfigDATA install-strip installcheck \
|
||||||
installcheck-am installdirs maintainer-clean \
|
installcheck-am installdirs maintainer-clean \
|
||||||
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||||
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
||||||
tags uninstall uninstall-am uninstall-info-am \
|
tags uninstall uninstall-am uninstall-info-am \
|
||||||
uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS
|
uninstall-libLTLIBRARIES uninstall-library_includeHEADERS \
|
||||||
|
uninstall-pkgconfigDATA
|
||||||
|
|
||||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
# 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.
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
|
|
|
@ -30,4 +30,4 @@ AC_FUNC_REALLOC
|
||||||
AC_CHECK_FUNCS([sqrtf], , AC_MSG_ERROR([required function sqrtf not found]))
|
AC_CHECK_FUNCS([sqrtf], , AC_MSG_ERROR([required function sqrtf not found]))
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile])
|
AC_CONFIG_FILES([Makefile])
|
||||||
AC_OUTPUT
|
AC_OUTPUT([libneofx-0.1.pc])
|
||||||
|
|
10
libneofx-0.1.pc.in
Normal file
10
libneofx-0.1.pc.in
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
prefix=@prefix@
|
||||||
|
exec_prefix=@exec_prefix@
|
||||||
|
libdir=@libdir@
|
||||||
|
includedir=@includedir@
|
||||||
|
|
||||||
|
Name: libneofx
|
||||||
|
Description: NeoFX library
|
||||||
|
Version: @VERSION@
|
||||||
|
Libs: -L${libdir} -lneofx
|
||||||
|
Cflags: -I${includedir}/libneofx-0.1
|
Reference in a new issue