mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Set AC_PREREQ to 2.67, enable Automake warnings 

Deprecate the use of the INCLUDES variable in favor of the AM_CPPFLAGS
variable per Automake warnings and documentation.
Hamlib-3.0
Nate Bargmann 2012-02-03 22:09:45 -06:00
rodzic f3e732ff94
commit a5f13e0056
4 zmienionych plików z 16 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
bindings/Makefile.am
Wyświetl plik

@ -3,8 +3,7 @@
# more information on swig at http://www.swig.org # more information on swig at http://www.swig.org
# #
#INCLUDES = @INCLUDES@ -Dbool=char -I@PERL_INC_DIR@ @TCL_INCLUDE_SPEC@ -I$(top_srcdir)/bindings AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/bindings @TCL_INCLUDE_SPEC@ @PYTHON_CPPFLAGS@
INCLUDES = @INCLUDES@ -I$(top_srcdir)/bindings @TCL_INCLUDE_SPEC@ @PYTHON_CPPFLAGS@
SWGFILES = hamlib.swg ignore.swg rig.swg rotator.swg SWGFILES = hamlib.swg ignore.swg rig.swg rotator.swg
@ -16,6 +15,7 @@ BUILT_SOURCES=
MOSTLYCLEANFILES= MOSTLYCLEANFILES=
AM_CFLAGS = -fno-strict-aliasing AM_CFLAGS = -fno-strict-aliasing
########################################## ##########################################
# Perl binding # Perl binding

18
configure.ac
Wyświetl plik

@ -1,7 +1,9 @@
## Process this file with autoconf to create configure. -*- autoconf -*- ## Process this file with autoconf to create configure. -*- autoconf -*-
## FIXME: Is this really new enough? ## dnl Autoconf 2.67 is in Debian Squeeze--is an older version needed
AC_PREREQ(2.59) dnl for some other distribution?
## FIXME: Is this too new? ##
AC_PREREQ(2.67)
## ------------------------ ## ## ------------------------ ##
@ -18,7 +20,9 @@ AC_CONFIG_MACRO_DIR([macros])
## ------------------------ ## ## ------------------------ ##
## Automake Initialisation. ## ## Automake Initialisation. ##
## ------------------------ ## ## ------------------------ ##
AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION, -) dnl Passing AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION to AM_INIT_AUTOMAKE is
dnl obsolete as these values are obtained from the AC_INIT macro.
AM_INIT_AUTOMAKE([-Wall])
AC_CONFIG_HEADERS([include/config.h]) AC_CONFIG_HEADERS([include/config.h])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
@ -92,7 +96,8 @@ fi
AC_SYS_POSIX_TERMIOS() AC_SYS_POSIX_TERMIOS()
INCLUDES="${INCLUDES} -I\$(top_srcdir)/include -I\$(top_srcdir)/src -I\$(top_srcdir)/lib" # Add Hamlib header include paths
AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_srcdir)/include -I\$(top_srcdir)/src -I\$(top_srcdir)/lib"
dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_SIZE_T AC_TYPE_SIZE_T
@ -184,7 +189,7 @@ AC_SUBST(LIBLTDL)
case "$host_os" in case "$host_os" in
freebsd*) freebsd*)
INCLUDES="-I/usr/local/include ${INCLUDES}" AM_CPPFLAGS="-I/usr/local/include ${AM_CPPFLAGS}"
AM_LDFLAGS="${AM_LDFLAGS} -L/usr/local/lib" AM_LDFLAGS="${AM_LDFLAGS} -L/usr/local/lib"
AC_SUBST([AM_LDFLAGS]) AC_SUBST([AM_LDFLAGS])
;; ;;
@ -470,7 +475,7 @@ AC_SUBST(BINDING_UNINSTALL)
AC_SUBST(BINDING_LIST) AC_SUBST(BINDING_LIST)
AC_SUBST(BINDING_LIB_TARGETS) AC_SUBST(BINDING_LIB_TARGETS)
AC_SUBST(INCLUDES) AC_SUBST(AM_CPPFLAGS)
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
macros/Makefile macros/Makefile
@ -543,7 +548,6 @@ echo \
Enable WinRadio ${cf_with_winradio} Enable WinRadio ${cf_with_winradio}
Enable USRP ${cf_with_usrp} Enable USRP ${cf_with_usrp}
Enable USB backends ${cf_with_libusb} Enable USB backends ${cf_with_libusb}
Enable RPC backends ${cf_with_rpc_backends}
Enable shared libs ${enable_shared} Enable shared libs ${enable_shared}
Enable static libs ${enable_static} Enable static libs ${enable_static}

5
doc/Makefile.am
Wyświetl plik

@ -1,6 +1,3 @@
INCLUDES = @INCLUDES@
EXTRA_DIST = hamlib.cfg index.doxygen hamlib.css footer.html EXTRA_DIST = hamlib.cfg index.doxygen hamlib.css footer.html
SRCDOCLST = ../src/rig.c ../src/rotator.c ../src/tones.c ../src/locator.c \ SRCDOCLST = ../src/rig.c ../src/rotator.c ../src/tones.c ../src/locator.c \
@ -8,5 +5,3 @@ SRCDOCLST = ../src/rig.c ../src/rotator.c ../src/tones.c ../src/locator.c \
doc: hamlib.cfg $(SRCDOCLST) doc: hamlib.cfg $(SRCDOCLST)
doxygen hamlib.cfg doxygen hamlib.cfg
#man_MANS= man/man3/rig.c.3

2
src/Makefile.am
Wyświetl plik

@ -1,4 +1,4 @@
INCLUDES = @INCLUDES@ @INCLTDL@ AM_CPPFLAGS = @AM_CPPFLAGS@ @INCLTDL@
RIGSRC = rig.c serial.c misc.c register.c event.c cal.c conf.c tones.c \ RIGSRC = rig.c serial.c misc.c register.c event.c cal.c conf.c tones.c \
rotator.c locator.c rot_reg.c rot_conf.c iofunc.c ext.c \ rotator.c locator.c rot_reg.c rot_conf.c iofunc.c ext.c \
mem.c settings.c parallel.c usb_port.c debug.c network.c \ mem.c settings.c parallel.c usb_port.c debug.c network.c \