[PATCH app-xdm 07/11] greeter: transfer -DGREET_LIB from configure.ac to Makefile.am

Gaetan Nadon memsize at videotron.ca
Sun Aug 29 06:24:48 PDT 2010


It does not depend on module configuration.
It should not mixed with flags required by dependencies.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac        |    2 --
 greeter/Makefile.am |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 142ac7e..68a3c5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -385,8 +385,6 @@ PKG_CHECK_MODULES(AUTH, xau)
 # Greeter
 #
 
-GREETER_CFLAGS="$GREETER_CFLAGS -DGREET_LIB"
-
 # The xdm binary needs to export symbols so that they can be used from
 # libXdmGreet.so.  Some platforms require extra flags to do this.
 # gcc should set these flags when -rdynamic is passed to it, other
diff --git a/greeter/Makefile.am b/greeter/Makefile.am
index 668a2fd..52c84b0 100644
--- a/greeter/Makefile.am
+++ b/greeter/Makefile.am
@@ -11,7 +11,7 @@ libXdmGreet_la_SOURCES = \
 
 libXdmGreet_la_LIBADD = $(XDMGREET_LIBS)
 
-AM_CFLAGS = $(CWARNFLAGS) $(XDMGREET_CFLAGS) -I$(top_srcdir)
+AM_CFLAGS = $(CWARNFLAGS) $(XDMGREET_CFLAGS) -DGREET_LIB -I$(top_srcdir)
 
 libXdmGreet_la_LDFLAGS = -module -avoid-version
 
-- 
1.6.0.4



More information about the xorg-devel mailing list