Silence automake warnings

When commenting out a binary, also comment out the related variables.
Don't include Makefile.decl in gtk-doc Makefile.am's as they disagree
on assigning to EXTRA_DIST.
This commit is contained in:
Kristian Høgsberg 2011-01-03 10:55:23 -05:00
parent cacee7e7a3
commit 9c002cf2c1
5 changed files with 6 additions and 9 deletions

View File

@ -1,5 +1,4 @@
## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl
AUTOMAKE_OPTIONS = 1.6

View File

@ -1,5 +1,4 @@
## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl
AUTOMAKE_OPTIONS = 1.6

View File

@ -1,5 +1,4 @@
## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl
AUTOMAKE_OPTIONS = 1.7

View File

@ -16,8 +16,8 @@ progs_ldadd = \
$(NULL)
#TEST_PROGS += check-gdk-cairo
check_gdk_cairo_SOURCES = check-gdk-cairo.c
check_gdk_cairo_LDADD = $(progs_ldadd)
#check_gdk_cairo_SOURCES = check-gdk-cairo.c
#check_gdk_cairo_LDADD = $(progs_ldadd)
TEST_PROGS += gdk-color
gdk_color_SOURCES = gdk-color.c

View File

@ -57,8 +57,8 @@ floating_LDADD = $(progs_ldadd)
# on a naked X server creates slightly different event
# sequences than running on a normal desktop
# TEST_PROGS += crossingevents
crossingevents_SOURCES = crossingevents.c
crossingevents_LDADD = $(progs_ldadd)
#crossingevents_SOURCES = crossingevents.c
#crossingevents_LDADD = $(progs_ldadd)
# Should be ported to new API's
#TEST_PROGS += filechooser
@ -72,9 +72,9 @@ builder_LDFLAGS = -export-dynamic
if OS_UNIX
#TEST_PROGS += defaultvalue
#defaultvalue_SOURCES = defaultvalue.c pixbuf-init.c
#defaultvalue_LDADD = $(progs_ldadd)
endif
defaultvalue_SOURCES = defaultvalue.c pixbuf-init.c
defaultvalue_LDADD = $(progs_ldadd)
TEST_PROGS += textbuffer
textbuffer_SOURCES = textbuffer.c pixbuf-init.c