diff options
| author | Tollef Fog Heen <tfheen@err.no> | 2010-08-19 18:54:12 +0200 |
|---|---|---|
| committer | Tollef Fog Heen <tfheen@err.no> | 2011-04-13 20:16:23 +0200 |
| commit | 99964eddb5935173fcedfc793e762d7dc7d01bba (patch) | |
| tree | a8894ef430f223c0ca278d6ff1206791eb0ad0af /Makefile.am | |
| parent | 03bd4a55287cd9492c5fde6adb1ac81a37b75cce (diff) | |
| download | pkg-config-99964eddb5935173fcedfc793e762d7dc7d01bba.tar.gz | |
Stop shipping an embedded glib
Drop the embedded glib, the associated patches and adjust build
scripts appropriately.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index a7d9fc6..5fde154 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,4 @@ -if USE_INSTALLED_GLIB -included_glib_includes = @GLIB_CFLAGS@ pkg_config_LDADD=@GLIB_LIBS@ -else -GLIB_SUBDIR = glib-1.2.10 -included_glib_includes = -I$(top_srcdir)/glib-1.2.10 -I$(top_builddir)/glib-1.2.10 -pkg_config_LDADD=glib-1.2.10/libglib.la -endif if USE_INSTALLED_POPT pkg_config_LDADD += $(POPT_LIBS) @@ -28,7 +21,7 @@ EXTRA_DIST = $(m4_DATA) $(man_MANS) README.win32 bin_PROGRAMS = pkg-config AM_CFLAGS=@WARN_CFLAGS@ -INCLUDES=-DPKG_CONFIG_PC_PATH="\"$(pc_path)\"" $(included_glib_includes) \ +INCLUDES=-DPKG_CONFIG_PC_PATH="\"$(pc_path)\"" @GLIB_CFLAGS@ \ $(popt_includes) pkg_config_SOURCES= \ |