hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed some cross-compiling problems in build files

Browse Source 
- 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:
hyung-hwan
2013-02-26 18:31:38 +00:00
parent b4e1c58553
commit a426fe24f4
22 changed files with 85 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qse/cmd/awk/Makefile.am
View File

@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = nostdinc
AM_CPPFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
-I$(includedir) $(LTDLINCL)
$(LTDLINCL)
if WIN32
# you must adjust the value of DEFAULT_MODPOSTFIX according to
@ -18,7 +18,7 @@ endif
bin_PROGRAMS = qseawk
qseawk_SOURCES = awk.c
qseawk_LDFLAGS = -L../../lib/awk -L../../lib/cmn -L$(libdir)
qseawk_LDFLAGS = -L../../lib/awk -L../../lib/cmn
qseawk_LDADD = -lqseawk -lqsecmn $(LIBM) $(LIBLTDL)
if WIN32

4
qse/cmd/awk/Makefile.in
View File

@ -277,9 +277,9 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = nostdinc
AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(includedir) $(LTDLINCL) $(am__append_1) $(am__append_2)
$(LTDLINCL) $(am__append_1) $(am__append_2)
qseawk_SOURCES = awk.c
qseawk_LDFLAGS = -L../../lib/awk -L../../lib/cmn -L$(libdir)
qseawk_LDFLAGS = -L../../lib/awk -L../../lib/cmn
qseawk_LDADD = -lqseawk -lqsecmn $(LIBM) $(LIBLTDL) $(am__append_3)
all: all-am

7
qse/cmd/http/Makefile.am
View File

@ -2,8 +2,7 @@ AUTOMAKE_OPTIONS = nostdinc
AM_CPPFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
-I$(includedir)
-I$(top_srcdir)/include
qsecfgdir = $(sysconfdir)/qse
@ -12,8 +11,8 @@ qsecfg_DATA = httpd.conf httpd-mime.conf
bin_PROGRAMS = qsehttpd
qsehttpd_SOURCES = httpd.c
qsehttpd_LDFLAGS = -L../../lib/xli -L../../lib/http -L../../lib/cmn -L$(libdir)
qsehttpd_LDADD = -lqsexli -lqsehttp -lqsecmn
qsehttpd_LDFLAGS = -L../../lib/xli -L../../lib/http -L../../lib/cmn
qsehttpd_LDADD = -lqsexli -lqsehttp -lqsecmn
if WIN32
if WCHAR

5
qse/cmd/http/Makefile.in
View File

@ -301,13 +301,12 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = nostdinc
AM_CPPFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
-I$(includedir)
-I$(top_srcdir)/include
qsecfgdir = $(sysconfdir)/qse
qsecfg_DATA = httpd.conf httpd-mime.conf
qsehttpd_SOURCES = httpd.c
qsehttpd_LDFLAGS = -L../../lib/xli -L../../lib/http -L../../lib/cmn -L$(libdir)
qsehttpd_LDFLAGS = -L../../lib/xli -L../../lib/http -L../../lib/cmn
qsehttpd_LDADD = -lqsexli -lqsehttp -lqsecmn $(am__append_1)
EXTRA_DIST = $(qsecfg_DATA)
all: all-am

5
qse/cmd/sed/Makefile.am
View File

@ -2,13 +2,12 @@ AUTOMAKE_OPTIONS = nostdinc
AM_CPPFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
-I$(includedir)
-I$(top_srcdir)/include
bin_PROGRAMS = qsesed
qsesed_SOURCES = sed.c
qsesed_LDFLAGS = -L../../lib/sed -L../../lib/cmn -L$(libdir)
qsesed_LDFLAGS = -L../../lib/sed -L../../lib/cmn
qsesed_LDADD = -lqsesed -lqsecmn
if WIN32

5
qse/cmd/sed/Makefile.in
View File

@ -272,11 +272,10 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = nostdinc
AM_CPPFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
-I$(includedir)
-I$(top_srcdir)/include
qsesed_SOURCES = sed.c
qsesed_LDFLAGS = -L../../lib/sed -L../../lib/cmn -L$(libdir)
qsesed_LDFLAGS = -L../../lib/sed -L../../lib/cmn
qsesed_LDADD = -lqsesed -lqsecmn $(am__append_1)
all: all-am

5
qse/cmd/stx/Makefile.am
View File

@ -2,13 +2,12 @@ AUTOMAKE_OPTIONS = nostdinc
AM_CPPFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
-I$(includedir)
-I$(top_srcdir)/include
bin_PROGRAMS = qsestx
qsestx_SOURCES = stx.c
qsestx_LDFLAGS = -L../../lib/stx -L../../lib/cmn -L$(libdir)
qsestx_LDFLAGS = -L../../lib/stx -L../../lib/cmn
qsestx_LDADD = -lqsestx -lqsecmn $(LIBM)
if WIN32

5
qse/cmd/xli/Makefile.am
View File

@ -2,13 +2,12 @@ AUTOMAKE_OPTIONS = nostdinc
AM_CPPFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
-I$(includedir)
-I$(top_srcdir)/include
bin_PROGRAMS = qsexli
qsexli_SOURCES = xli.c
qsexli_LDFLAGS = -L../../lib/xli -L../../lib/cmn -L$(libdir)
qsexli_LDFLAGS = -L../../lib/xli -L../../lib/cmn
qsexli_LDADD = -lqsexli -lqsecmn
if WIN32

5
qse/cmd/xli/Makefile.in
View File

@ -272,11 +272,10 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = nostdinc
AM_CPPFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
-I$(includedir)
-I$(top_srcdir)/include
qsexli_SOURCES = xli.c
qsexli_LDFLAGS = -L../../lib/xli -L../../lib/cmn -L$(libdir)
qsexli_LDFLAGS = -L../../lib/xli -L../../lib/cmn
qsexli_LDADD = -lqsexli -lqsecmn $(am__append_1)
all: all-am