diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-03-05 00:40:17 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-03-07 20:57:37 +0100 |
| commit | 8ab6afb0c446c1ad5874b55e0f611627849ff2e8 (patch) | |
| tree | a2c45765eca629fa11a9fc208d916b2b8bb34151 /applications | |
| parent | 6d75aed5d100995f93c35d53652d0b95b4a8f95e (diff) | |
| download | rasdaman-upstream-8ab6afb0c446c1ad5874b55e0f611627849ff2e8.tar.gz rasdaman-upstream-8ab6afb0c446c1ad5874b55e0f611627849ff2e8.tar.xz rasdaman-upstream-8ab6afb0c446c1ad5874b55e0f611627849ff2e8.zip | |
build: Free up CPPFLAGS & Co. for users
The CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS vars should be
free for use by the person who does the build, so rasdaman
itself should put all its internally needed flags to
AM_CPPFLAGS, AM_CFLAGS, AM_CXXFLAGS, *_LIBS instead.
We do just that, and also put all the C preprocessor
defines in _CPPFLAGS so they are used for compiling
both C and C++ source files. This redistributes some
responsibilities from the _CFLAGS and _CXXFLAGS vars.
Also use _LDADD _LIBS where appropriate.
As a result, the user can now properly set CPPFLAGS,
CFLAGS, CXXFLAGS, LDFLAGS at configure or make time
and have these values used in the build.
Diffstat (limited to 'applications')
| -rw-r--r-- | applications/rasql/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/applications/rasql/Makefile.am b/applications/rasql/Makefile.am index 521af32..ddd7ea0 100644 --- a/applications/rasql/Makefile.am +++ b/applications/rasql/Makefile.am @@ -28,16 +28,16 @@ # ################################################################## -AM_CXXFLAGS=@CLIENTCXXFLAGS@ -AM_LDFLAGS=@CLIENTLDFLAGS@ - bin_PROGRAMS=rasql rasql_SOURCES= rasql.cc rasql_error.cc rasql_error.hh \ rasql_signal.cc rasql_signal.hh +rasql_CPPFLAGS = $(AM_CPPFLAGS) +rasql_CPPFLAGS += $(CLIENT_CPPFLAGS) rasql_LDADD = ../../rasodmg/librasodmg.a ../../clientcomm/libclientcomm.a \ ../../compression/libcompression.a ../../raslib/libraslib.a \ ../../conversion/libconversion.a ../../commline/libcommline.a \ ../../network/libnetwork.a +rasql_LDADD += $(CLIENT_LIBS) SUBDIRS= ../../rasodmg ../../clientcomm ../../compression \ ../../raslib ../../conversion ../../commline ../../network |