diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2010-01-29 22:45:46 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2010-01-29 22:50:21 -0800 |
| commit | 169e6d230f09627500d9c417350d3a8a9aa4dba4 (patch) | |
| tree | a4a48e47913f5f34484e08e37f5e73ebea95df3c | |
| parent | 12a1392fc96e32ed6d55208a2a7fc040617a9cb7 (diff) | |
Clean up CFLAGS/LIB settings in configure.ac & Makefile.am
- Use AM_CFLAGS so AM_PROG_CC_C_O isn't needed
- Combine pkg-config calls now that we don't need special handling for Xaw
- Add dependencies on libXmu & libXrender since xfd calls functions in
those directly
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 26b8a83..98ca998 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xfd -xfd_CFLAGS = $(XFD_CFLAGS) -DXRENDER -D_BSD_SOURCE +AM_CFLAGS = $(XFD_CFLAGS) $(CWARNFLAGS) -DXRENDER -D_BSD_SOURCE xfd_LDADD = $(XFD_LIBS) xfd_SOURCES = \ diff --git a/configure.ac b/configure.ac index 173d881..86f2a99 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,6 @@ XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) AC_PROG_CC -AM_PROG_CC_C_O AC_PROG_INSTALL # Internationalization & localization support @@ -59,16 +58,7 @@ fi AM_CONDITIONAL(USE_GETTEXT, test "x$USE_GETTEXT" = "xyes") # Checks for pkg-config packages -PKG_CHECK_MODULES(XAW, xaw7) - -PKG_CHECK_MODULES(ADDITIONAL, freetype2 fontconfig xft) - -XFD_CFLAGS="$XAW_CFLAGS $ADDITIONAL_CFLAGS" -XFD_LIBS="$XAW_LIBS $ADDITIONAL_LIBS" -XFD_CFLAGS="$CWARNFLAGS $XFD_CFLAGS" -AC_SUBST(XFD_CFLAGS) -AC_SUBST(XFD_LIBS) - +PKG_CHECK_MODULES(XFD, xaw7 freetype2 fontconfig xft xrender xmu) PKG_CHECK_MODULES(APPDEFS, xt) xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` |