Re: [PATCH 1/1] [build] be consistent in using CPPFLAGS vs CFLAGS

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Fabio M. Di Nitto napsal(a):
From: "Fabio M. Di Nitto" <fdinitto@xxxxxxxxxx>

Signed-off-by: Fabio M. Di Nitto <fdinitto@xxxxxxxxxx>
---
  exec/Makefile.am  | 6 +++++-
  tools/Makefile.am | 2 +-
  2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/exec/Makefile.am b/exec/Makefile.am
index 5c5df4e..f1854ba 100644
--- a/exec/Makefile.am
+++ b/exec/Makefile.am
@@ -50,7 +50,8 @@ lib_LTLIBRARIES		= libtotem_pg.la
  libtotem_pg_la_SOURCES	= $(TOTEM_SRC)
  libtotem_pg_la_CFLAGS	= $(nss_CFLAGS) $(rdmacm_CFLAGS) $(ibverbs_CFLAGS)
  libtotem_pg_la_LDFLAGS	= -version-number $(subst .,:,$(SONAME))
-libtotem_pg_la_LIBADD	= -lpthread $(LIBQB_LIBS) $(nss_LIBS) $(rdmacm_LIBS) $(ibverbs_LIBS)
+libtotem_pg_la_LIBADD	= -lpthread $(LIBQB_LIBS) $(nss_LIBS) \
+			  $(rdmacm_LIBS) $(ibverbs_LIBS)

  sbin_PROGRAMS		= corosync

@@ -70,8 +71,11 @@ endif

  corosync_CPPFLAGS	= -DLOGCONFIG_USE_ICMAP=1

+corosync_CFLAGS         = $(statgrap_CFLAGS)
+

^^^ typo? should be statgraB I believe

  corosync_LDADD		= libtotem_pg.la ../common_lib/libcorosync_common.la \
  			  $(LIBQB_LIBS) $(statgrab_LIBS)
+
  corosync_DEPENDENCIES	= libtotem_pg.la ../common_lib/libcorosync_common.la

  lint:
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8f4064a..4eb801a 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -67,7 +67,7 @@ corosync_quorumtool_LDADD = $(LIBQB_LIBS) \
  			    $(top_builddir)/lib/libquorum.la \
  			    $(top_builddir)/lib/libvotequorum.la

-corosync_notifyd_CPPFLAGS = $(DBUS_CFLAGS)
+corosync_notifyd_CFLAGS   = $(DBUS_CFLAGS)
  corosync_notifyd_LDADD    = $(LIBQB_LIBS) $(DBUS_LIBS) $(SNMP_LIBS) \
  			    $(top_builddir)/lib/libcmap.la \
  			    $(top_builddir)/lib/libcfg.la \


_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss




[Index of Archives]     [Linux Clusters]     [Corosync Project]     [Linux USB Devel]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Linux Kernel]     [Linux SCSI]     [X.Org]

  Powered by Linux