diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-11 08:31:55 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-11 09:15:53 -0700 |
| commit | 3d51edf9d96f8adcb6f2ab50f4960aa9ecc76afe (patch) | |
| tree | 39b814364eb43a6634c501e0f51a4760bff46755 | |
| parent | a57a7be5962f6f9536ab97751b177575a4884bd0 (diff) | |
Update to using xorg-macros 1.3, including XORG_DEFAULT_OPTIONS
Also move CWARNFLAGS addition to CFLAGS from configure.ac to Makefile.am's
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | greeter/Makefile.am | 5 |
3 files changed, 12 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 09c57f4..e90f7bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,6 +26,8 @@ bin_PROGRAMS = xdm xdmshell xdmlibdir = $(XDMLIBDIR) xdmlib_PROGRAMS = chooser +AM_CFLAGS = $(CWARNFLAGS) + # # xdm # @@ -174,7 +176,7 @@ EXTRA_DIST += $(APPDEFAULTFILES:%=%.ad) if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) lint: $(LINT) $(ALL_LINT_FLAGS) $(xdm_CFLAGS) $(xdm_SOURCES) $(xdm_LDADD) diff --git a/configure.ac b/configure.ac index fb46901..6e05acc 100644 --- a/configure.ac +++ b/configure.ac @@ -26,9 +26,9 @@ AC_INIT(xdm,[1.1.8],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xd AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_CWARNFLAGS, XORG_CHANGELOG m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +XORG_MACROS_VERSION(1.3) AM_CONFIG_HEADER(config.h) @@ -40,11 +40,12 @@ AM_PROG_LIBTOOL AC_PROG_INSTALL XORG_PROG_RAWCPP -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS +XORG_WITH_LINT -XDM_CFLAGS="$CWARNFLAGS $XDM_CFLAGS" -GREETER_CFLAGS="$CWARNFLAGS $GREETER_CFLAGS" -CHOOSER_CFLAGS="$CWARNFLAGS $CHOOSER_CFLAGS" +XDM_CFLAGS="$XDM_CFLAGS" +GREETER_CFLAGS="$GREETER_CFLAGS" +CHOOSER_CFLAGS="$CHOOSER_CFLAGS" # Check for mktemp to prevent security issue noted in Xorg bug #5898 # See https://bugs.freedesktop.org/show_bug.cgi?id=5898 for details. @@ -581,9 +582,4 @@ AC_SUBST(appdefaultdir) AC_SUBST(MKTEMP_COMMAND) -XORG_WITH_LINT -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile config/Makefile greeter/Makefile]) diff --git a/greeter/Makefile.am b/greeter/Makefile.am index f5ceaac..70fa5df 100644 --- a/greeter/Makefile.am +++ b/greeter/Makefile.am @@ -1,4 +1,3 @@ - if DYNAMIC_GREETER xdmlibdir = $(XDMLIBDIR) @@ -11,14 +10,14 @@ libXdmGreet_la_SOURCES = \ libXdmGreet_la_LIBADD = $(XDMGREET_LIBS) -AM_CFLAGS = $(XDMGREET_CFLAGS) -I$(top_srcdir) +AM_CFLAGS = $(CWARNFLAGS) $(XDMGREET_CFLAGS) -I$(top_srcdir) libXdmGreet_la_LDFLAGS = -module -avoid-version endif if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) lint: $(LINT) $(ALL_LINT_FLAGS) $(libXdmGreet_la_SOURCES) |