diff options
| -rw-r--r-- | Makefile.am | 44 | ||||
| -rw-r--r-- | check/Makefile.am | 36 |
2 files changed, 47 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am index 312d109..0e58512 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,42 +1,33 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -pkg_config_LDADD=@GLIB_LIBS@ - if INTERNAL_GLIB GLIB_SUBDIR = glib endif -SUBDIRS = $(GLIB_SUBDIR) . check - -# normally we'd want glib to be part of DIST_SUBDIRS unconditionally, +# Normally we'd want glib to be part of DIST_SUBDIRS unconditionally, # but distclean gets broken unless we always run glib's configure -DIST_SUBDIRS = $(GLIB_SUBDIR) . check - -m4dir = $(datadir)/aclocal -m4_DATA = pkg.m4 - -dist_doc_DATA = pkg-config-guide.html - -man_MANS = pkg-config.1 -EXTRA_DIST = $(m4_DATA) $(man_MANS) README.win32 - -bin_PROGRAMS = pkg-config -AM_CFLAGS=@WARN_CFLAGS@ +SUBDIRS = $(GLIB_SUBDIR) . check +DIST_SUBDIRS = $(SUBDIRS) +# Escape paths properly on windows if NATIVE_WIN32 -INCLUDES= \ +AM_CPPFLAGS = \ -DPKG_CONFIG_PC_PATH="\"$(subst /,\/,$(pc_path))\"" \ -DPKG_CONFIG_SYSTEM_INCLUDE_PATH="\"$(subst /,\/,$(system_include_path))\"" \ - -DPKG_CONFIG_SYSTEM_LIBRARY_PATH="\"$(subst /,\/,$(system_library_path))\"" \ - @GLIB_CFLAGS@ + -DPKG_CONFIG_SYSTEM_LIBRARY_PATH="\"$(subst /,\/,$(system_library_path))\"" else -INCLUDES= \ +AM_CPPFLAGS = \ -DPKG_CONFIG_PC_PATH="\"$(pc_path)\"" \ -DPKG_CONFIG_SYSTEM_INCLUDE_PATH="\"$(system_include_path)\"" \ - -DPKG_CONFIG_SYSTEM_LIBRARY_PATH="\"$(system_library_path)\"" \ - @GLIB_CFLAGS@ + -DPKG_CONFIG_SYSTEM_LIBRARY_PATH="\"$(system_library_path)\"" endif +AM_CFLAGS = \ + $(WARN_CFLAGS) \ + $(GLIB_CFLAGS) + +bin_PROGRAMS = pkg-config +pkg_config_LDADD = $(GLIB_LIBS) pkg_config_SOURCES= \ pkg.h \ pkg.c \ @@ -44,6 +35,13 @@ pkg_config_SOURCES= \ parse.c \ main.c +# Various data files +m4dir = $(datadir)/aclocal +dist_m4_DATA = pkg.m4 +dist_doc_DATA = pkg-config-guide.html +dist_man_MANS = pkg-config.1 +EXTRA_DIST = README.win32 + # Since we can't always have glib in DIST_SUBDIRS, we need to make sure # glib is configured when we want to run dist. Unfortunately, there's no # DIST_CONFIGURE_FLAGS. diff --git a/check/Makefile.am b/check/Makefile.am index 0ce476a..fd9cd98 100644 --- a/check/Makefile.am +++ b/check/Makefile.am @@ -1,12 +1,28 @@ +TESTS = \ + check-cflags \ + check-libs \ + check-define-variable \ + check-libs-private \ + check-requires-private \ + check-includedir \ + check-conflicts \ + check-missing \ + check-idirafter \ + check-whitespace \ + check-cmd-options \ + check-version -TESTS = check-cflags check-libs check-define-variable \ - check-libs-private check-requires-private check-includedir \ - check-conflicts check-missing check-idirafter check-whitespace \ - check-cmd-options check-version - -EXTRA_DIST = $(TESTS) common simple.pc requires-test.pc public-dep.pc \ - private-dep.pc includedir.pc missing-requires-private.pc \ - missing-requires.pc idirafter.pc conflicts-test.pc whitespace.pc \ +EXTRA_DIST = \ + $(TESTS) \ + common \ + simple.pc \ + requires-test.pc \ + public-dep.pc \ + private-dep.pc \ + includedir.pc \ + missing-requires-private.pc \ + missing-requires.pc \ + idirafter.pc \ + conflicts-test.pc \ + whitespace.pc \ fields-blank.pc - -DISTCLEANFILES = config.sh |