aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2012-03-03 14:43:34 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2012-03-03 14:46:28 +0000
commit2de0d6cd582191efbca6d1c923960f2f0cc6e2bd (patch)
tree565cbf6171cdbd68b14b5d2c5e5291e649d2ac93
parent61bee67f6b3a0947f1af20f1c04b9ba3399828f9 (diff)
downloadpaludis-2de0d6cd582191efbca6d1c923960f2f0cc6e2bd.tar.gz
paludis-2de0d6cd582191efbca6d1c923960f2f0cc6e2bd.tar.xz
Reorder CXXFLAGS to make warnings go away
-rw-r--r--ruby/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 5e8e79d..34f947a 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -76,12 +76,12 @@ if ENABLE_RUBY
lib_LTLIBRARIES = libpaludisruby_@PALUDIS_PC_SLOT@.la
-libpaludisruby_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) -I. $(RUBY_CFLAGS)
+libpaludisruby_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(RUBY_CFLAGS) $(AM_CXXFLAGS) -I.
libpaludisruby_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
paludis_ruby_so.o : paludis_ruby_so.cc
if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) \
- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) $(RUBY_CFLAGS) -c \
+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(RUBY_CFLAGS) $(AM_CXXFLAGS) -c \
-o $@ $(srcdir)/paludis_ruby_so.cc ; then ln -fs .libs/paludis_ruby_so.o $@ ; else rm -f $@ ; exit 1 ; fi
libpaludisruby_@PALUDIS_PC_SLOT@_la_SOURCES = $(IF_RUBY_SOURCES)