diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-06-15 14:37:29 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-06-15 14:37:29 +0100 |
| commit | 728732438bbbe81f3d44e0890e2dd243340722ad (patch) | |
| tree | 2747e6333701f3610eae918343cc56fe68433ce6 /Makefile.am | |
| parent | 83678af5e0b3cdc8d3df875ef661746a0971613c (diff) | |
| download | gstreamer-plugins-good-728732438bbbe81f3d44e0890e2dd243340722ad.tar.gz | |
Remove gconf elements and plugin
GConf was deprecated in favour of GSettings etc.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index fb78f5d65..0119fad4c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,5 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc -if USE_GCONFTOOL -GCONF_DIR = gconf -else -GCONF_DIR = -endif - ALWAYS_SUBDIRS = \ gst sys ext \ tests \ @@ -15,14 +9,9 @@ ALWAYS_SUBDIRS = \ m4 \ pkgconfig -SUBDIRS = \ - $(ALWAYS_SUBDIRS) \ - $(GCONF_DIR) - -DIST_SUBDIRS = \ - $(ALWAYS_SUBDIRS) \ - gconf +SUBDIRS = $(ALWAYS_SUBDIRS) +DIST_SUBDIRS = $(ALWAYS_SUBDIRS) # include before EXTRA_DIST for win32 assignment include $(top_srcdir)/common/win32.mak |