diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2012-05-22 09:21:25 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2012-05-23 05:47:26 -0700 |
| commit | 5c219ca67d6e895d423863d996494ac8aed40d8a (patch) | |
| tree | f60177ead743dd317adb7c31baae60bfc408cfcc /Makefile.am | |
| parent | 7a8cc77163bdf5f648326cd31f528400ebc8fbcb (diff) | |
| download | pkg-config-5c219ca67d6e895d423863d996494ac8aed40d8a.tar.gz | |
Makefile cleanup
No functional change, but makes things a little cleaner.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 44 |
1 files changed, 21 insertions, 23 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. |