[gdk-pixbuf] Remove Makefile.decl



commit 74ecac063ebc074af8af6f4c58c2885852abbab5
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Dec 20 22:15:00 2013 -0500

    Remove Makefile.decl
    
    We are now using glib-tap.mk for the tests, and all we gain
    from Makefile.decl is a predefined EXTRA_DIST, which doesn't
    seem worth it.

 Makefile.am                           |    4 +-
 Makefile.decl                         |   82 ---------------------------------
 contrib/Makefile.am                   |    2 -
 docs/Makefile.am                      |    2 -
 docs/reference/Makefile.am            |    2 -
 docs/reference/gdk-pixbuf/Makefile.am |    3 -
 gdk-pixbuf/Makefile.am                |    3 +-
 gdk-pixbuf/pixops/Makefile.am         |    4 +-
 8 files changed, 3 insertions(+), 99 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a726da5..ed4a5c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,6 @@
-include $(top_srcdir)/Makefile.decl
-
 SUBDIRS = gdk-pixbuf po docs tests contrib build
 
-EXTRA_DIST +=                  \
+EXTRA_DIST =                   \
        config.h.win32          \
        glib-tap.mk             \
        tap-driver.sh           \
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index feb4bdb..adff284 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/Makefile.decl
-
 SUBDIRS =
 if USE_X11
 SUBDIRS += gdk-pixbuf-xlib
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 470cddf..034926c 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/Makefile.decl
-
 SUBDIRS = reference
 
 -include $(top_srcdir)/git.mk
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index bc0b954..3248edf 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/Makefile.decl
-
 SUBDIRS = gdk-pixbuf
 
 GITIGNOREFILES = */*.1
diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index 1583a6f..61cfe49 100644
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -1,6 +1,3 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module.
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index b2bc1ff..4ea900a 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -1,4 +1,3 @@
-include $(top_srcdir)/Makefile.decl
 -include $(INTROSPECTION_MAKEFILE)
 
 INTROSPECTION_GIRS =
@@ -672,7 +671,7 @@ distclean-local:
          rm -f $(MAINTAINERCLEANFILES); \
        fi
 
-EXTRA_DIST +=                                  \
+EXTRA_DIST =                                   \
         gdk-pixbuf-csource.1                   \
        makefile.msc                            \
        gdk-pixbuf.symbols                      \
diff --git a/gdk-pixbuf/pixops/Makefile.am b/gdk-pixbuf/pixops/Makefile.am
index 809bfa8..eb1fef4 100644
--- a/gdk-pixbuf/pixops/Makefile.am
+++ b/gdk-pixbuf/pixops/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/Makefile.decl
-
 noinst_LTLIBRARIES = libpixops.la
 
 AM_CPPFLAGS = \
@@ -26,7 +24,7 @@ libpixops_la_SOURCES =                \
        pixops-internal.h               \
        $(mmx_sources)
 
-EXTRA_DIST +=                          \
+EXTRA_DIST =                           \
        DETAILS                         \
        pixbuf-transform-math.ltx       \
        makefile.msc


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]