fixed some cross-compiling problems in build files
- specifying $(includedir) to AM_CPPFLAGS caused problems when --prefix was set to /usr during cross-compliation since header files for the cross compiler conflicted with files in $(includedir)=/usr/include. - the same applies to $(libdir) in LDFLAGS or something similar
This commit is contained in:
@ -2,8 +2,7 @@ AUTOMAKE_OPTIONS = nostdinc
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(includedir)
|
||||
-I$(top_srcdir)/include
|
||||
|
||||
lib_LTLIBRARIES = libqsehttp.la
|
||||
libqsehttp_la_SOURCES = \
|
||||
@ -23,6 +22,6 @@ libqsehttp_la_SOURCES = \
|
||||
httpd-text.c \
|
||||
upxd.c
|
||||
|
||||
libqsehttp_la_LDFLAGS = -version-info 1:0:0 -no-undefined -L../cmn -L$(libdir)
|
||||
libqsehttp_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined
|
||||
libqsehttp_la_LIBADD = -lqsecmn $(SOCKET_LIBS) $(SENDFILE_LIBS) $(SSL_LIBS)
|
||||
|
||||
|
@ -300,8 +300,7 @@ top_srcdir = @top_srcdir@
|
||||
AUTOMAKE_OPTIONS = nostdinc
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(includedir)
|
||||
-I$(top_srcdir)/include
|
||||
|
||||
lib_LTLIBRARIES = libqsehttp.la
|
||||
libqsehttp_la_SOURCES = \
|
||||
@ -321,7 +320,7 @@ libqsehttp_la_SOURCES = \
|
||||
httpd-text.c \
|
||||
upxd.c
|
||||
|
||||
libqsehttp_la_LDFLAGS = -version-info 1:0:0 -no-undefined -L../cmn -L$(libdir)
|
||||
libqsehttp_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined
|
||||
libqsehttp_la_LIBADD = -lqsecmn $(SOCKET_LIBS) $(SENDFILE_LIBS) $(SSL_LIBS)
|
||||
all: all-am
|
||||
|
||||
|
Reference in New Issue
Block a user