mirror of
https://github.com/fadden/nulib2.git
synced 2024-06-15 17:29:39 +00:00
Merge pull request #10 from ksherlock/pkg-config
pkg-config support for nufxlib
This commit is contained in:
commit
2a5e5bc299
1
nufxlib/.gitignore
vendored
1
nufxlib/.gitignore
vendored
|
@ -3,6 +3,7 @@ Makefile
|
||||||
config.h
|
config.h
|
||||||
config.log
|
config.log
|
||||||
config.status
|
config.status
|
||||||
|
nufxlib.pc
|
||||||
|
|
||||||
# generated binaries
|
# generated binaries
|
||||||
libnufx.a
|
libnufx.a
|
||||||
|
|
|
@ -60,14 +60,16 @@ all: $(PRODUCT) samples
|
||||||
install: $(STATIC_PRODUCT)
|
install: $(STATIC_PRODUCT)
|
||||||
$(srcdir)/mkinstalldirs $(libdir)
|
$(srcdir)/mkinstalldirs $(libdir)
|
||||||
$(INSTALL_DATA) $(STATIC_PRODUCT) $(libdir)
|
$(INSTALL_DATA) $(STATIC_PRODUCT) $(libdir)
|
||||||
$(srcdir)/mkinstalldirs $(includedir)
|
$(srcdir)/mkinstalldirs $(includedir) $(libdir)/pkgconfig
|
||||||
$(INSTALL_DATA) NufxLib.h $(includedir)
|
$(INSTALL_DATA) NufxLib.h $(includedir)
|
||||||
|
$(INSTALL_DATA) nufxlib.pc $(libdir)/pkgconfig
|
||||||
|
|
||||||
install-shared: $(SHARED_PRODUCT)
|
install-shared: $(SHARED_PRODUCT)
|
||||||
$(srcdir)/mkinstalldirs $(libdir)
|
$(srcdir)/mkinstalldirs $(libdir)
|
||||||
$(INSTALL_DATA) $(SHARED_PRODUCT) $(libdir)
|
$(INSTALL_DATA) $(SHARED_PRODUCT) $(libdir)
|
||||||
$(srcdir)/mkinstalldirs $(includedir)
|
$(srcdir)/mkinstalldirs $(includedir) $(libdir)/pkgconfig
|
||||||
$(INSTALL_DATA) NufxLib.h $(includedir)
|
$(INSTALL_DATA) NufxLib.h $(includedir)
|
||||||
|
$(INSTALL_DATA) nufxlib.pc $(libdir)/pkgconfig
|
||||||
|
|
||||||
samples:: $(STATIC_PRODUCT)
|
samples:: $(STATIC_PRODUCT)
|
||||||
@echo "Building samples..."
|
@echo "Building samples..."
|
||||||
|
|
8
nufxlib/configure
vendored
8
nufxlib/configure
vendored
|
@ -626,6 +626,7 @@ BUILD_FLAGS
|
||||||
EGREP
|
EGREP
|
||||||
GREP
|
GREP
|
||||||
CPP
|
CPP
|
||||||
|
NUFX_VERSION
|
||||||
RANLIB
|
RANLIB
|
||||||
SET_MAKE
|
SET_MAKE
|
||||||
INSTALL_DATA
|
INSTALL_DATA
|
||||||
|
@ -3273,6 +3274,10 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
NUFX_VERSION=3.1.0
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ac_ext=c
|
ac_ext=c
|
||||||
ac_cpp='$CPP $CPPFLAGS'
|
ac_cpp='$CPP $CPPFLAGS'
|
||||||
|
@ -4220,7 +4225,7 @@ if test "${enable_dmalloc+set}" = set; then :
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
ac_config_files="$ac_config_files Makefile samples/Makefile"
|
ac_config_files="$ac_config_files Makefile samples/Makefile nufxlib.pc"
|
||||||
|
|
||||||
cat >confcache <<\_ACEOF
|
cat >confcache <<\_ACEOF
|
||||||
# This file is a shell script that caches the results of configure
|
# This file is a shell script that caches the results of configure
|
||||||
|
@ -4915,6 +4920,7 @@ do
|
||||||
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
|
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
|
||||||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||||
"samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
|
"samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
|
||||||
|
"nufxlib.pc") CONFIG_FILES="$CONFIG_FILES nufxlib.pc" ;;
|
||||||
|
|
||||||
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -16,6 +16,10 @@ AC_PROG_INSTALL
|
||||||
AC_PROG_MAKE_SET
|
AC_PROG_MAKE_SET
|
||||||
AC_PROG_RANLIB
|
AC_PROG_RANLIB
|
||||||
|
|
||||||
|
NUFX_VERSION=3.1.0
|
||||||
|
AC_SUBST(NUFX_VERSION)
|
||||||
|
|
||||||
|
|
||||||
dnl Checks for header files.
|
dnl Checks for header files.
|
||||||
AC_CHECK_HEADERS(fcntl.h malloc.h stdlib.h sys/stat.h sys/time.h sys/types.h \
|
AC_CHECK_HEADERS(fcntl.h malloc.h stdlib.h sys/stat.h sys/time.h sys/types.h \
|
||||||
sys/utime.h unistd.h utime.h)
|
sys/utime.h unistd.h utime.h)
|
||||||
|
@ -215,4 +219,4 @@ AC_ARG_ENABLE(dmalloc, [ --enable-dmalloc do dmalloc stuff],
|
||||||
[ echo "--- enabling dmalloc";
|
[ echo "--- enabling dmalloc";
|
||||||
LIBS="$LIBS -L/usr/local/lib -ldmalloc"; AC_DEFINE(USE_DMALLOC, [], [Define if we want to use the dmalloc library (also need -l in Makefile).]) ])
|
LIBS="$LIBS -L/usr/local/lib -ldmalloc"; AC_DEFINE(USE_DMALLOC, [], [Define if we want to use the dmalloc library (also need -l in Makefile).]) ])
|
||||||
|
|
||||||
AC_OUTPUT(Makefile samples/Makefile)
|
AC_OUTPUT(Makefile samples/Makefile nufxlib.pc)
|
||||||
|
|
10
nufxlib/nufxlib.pc.in
Normal file
10
nufxlib/nufxlib.pc.in
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
prefix=@prefix@
|
||||||
|
exec_prefix=@exec_prefix@
|
||||||
|
libdir=@libdir@
|
||||||
|
includedir=@includedir@
|
||||||
|
|
||||||
|
Name: nufxlib
|
||||||
|
Description: NuFX archive manipulation library.
|
||||||
|
Version: @NUFX_VERSION@
|
||||||
|
Libs: -L${libdir} -lnufx @LIBS@
|
||||||
|
Cflags: -I${includedir}
|
Loading…
Reference in New Issue
Block a user