mirror/libserialport
mirror/libserialport
1
0
Fork 0
mirror of git://sigrok.org/libserialport synced 2023-08-10 21:13:24 +03:00
Code Issues Projects Releases Wiki Activity

autotools: Don't set/override "user variables".

Browse Source 
This fixes bug #577.
This commit is contained in:
Uwe Hermann 2015-04-19 18:36:58 +02:00
parent a630a469f6
commit 025c264448
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.am
View File

@ -22,6 +22,9 @@ ACLOCAL_AMFLAGS = -I autostuff
AM_CPPFLAGS = -I$(top_srcdir) AM_CPPFLAGS = -I$(top_srcdir)
# Enable more compiler warnings.
AM_CFLAGS = -std=c99 -Wall -Wextra -pedantic -Wmissing-prototypes -Wshadow
lib_LTLIBRARIES = libserialport.la lib_LTLIBRARIES = libserialport.la
libserialport_la_SOURCES = serialport.c libserialport_internal.h libserialport_la_SOURCES = serialport.c libserialport_internal.h
@ -39,13 +42,15 @@ libserialport_la_SOURCES += freebsd.c
endif endif
libserialport_la_LIBADD = $(LIBOBJS) libserialport_la_LIBADD = $(LIBOBJS)
libserialport_la_LDFLAGS = $(SP_LIB_LDFLAGS) -no-undefined
if WIN32 if WIN32
libserialport_la_LIBADD += $(SP_LIBS) libserialport_la_LIBADD += $(SP_LIBS)
endif endif
libserialport_la_LDFLAGS = $(SP_LIB_LDFLAGS) -no-undefined
if MACOSX
libserialport_la_LDFLAGS += -framework IOKit -framework CoreFoundation
endif
library_includedir = $(includedir) library_includedir = $(includedir)
library_include_HEADERS = libserialport.h library_include_HEADERS = libserialport.h

4
configure.ac
View File

@ -42,9 +42,6 @@ AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
# Enable more compiler warnings.
CFLAGS="$CFLAGS -std=c99 -Wall -Wextra -pedantic -Wmissing-prototypes -Wshadow"
# Checks for programs. # Checks for programs.
AC_PROG_CC AC_PROG_CC
AC_PROG_CPP AC_PROG_CPP
@ -89,7 +86,6 @@ case $host_os in
AM_CONDITIONAL([WIN32], false) AM_CONDITIONAL([WIN32], false)
AM_CONDITIONAL([MACOSX], true) AM_CONDITIONAL([MACOSX], true)
AM_CONDITIONAL([FREEBSD], false) AM_CONDITIONAL([FREEBSD], false)
LDFLAGS="$LDFLAGS -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation"
AC_CHECK_HEADER(IOKit/IOKitLib.h, [], [AC_MSG_ERROR([IOKit/IOKitLib.h not found])]) AC_CHECK_HEADER(IOKit/IOKitLib.h, [], [AC_MSG_ERROR([IOKit/IOKitLib.h not found])])
;; ;;
mingw* | cygwin*) mingw* | cygwin*)