From 35fb9ebe352a141ee9fe72b1e2a160e8c198bd16 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 25 Jun 2010 02:06:54 +0200 Subject: [PATCH] build-sys: almost completely make the build clean, missing are howl and avahi-gobject --- avahi-compat-howl/Makefile.am | 4 ++-- avahi-compat-howl/text-test.c | 4 ++-- avahi-python/avahi-discover/Makefile.am | 6 +++--- avahi-sharp/Makefile.am | 12 ++++++------ avahi-ui-sharp/Makefile.am | 10 +++++----- avahi-ui/Makefile.am | 10 +++++----- avahi-ui/avahi-ui.c | 1 - avahi-ui/bssh.c | 1 - 8 files changed, 23 insertions(+), 25 deletions(-) diff --git a/avahi-compat-howl/Makefile.am b/avahi-compat-howl/Makefile.am index 0940daf..e5bc395 100644 --- a/avahi-compat-howl/Makefile.am +++ b/avahi-compat-howl/Makefile.am @@ -89,7 +89,7 @@ address_test_SOURCES = \ $(HOWLHEADERS) \ address.c \ address-test.c \ - warn.c warn.h + warn.c warn.h address_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include address_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la @@ -97,7 +97,7 @@ text_test_SOURCES = \ $(HOWLHEADERS) \ text.c \ text-test.c \ - warn.c warn.h + warn.c warn.h text_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include text_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la diff --git a/avahi-compat-howl/text-test.c b/avahi-compat-howl/text-test.c index e0d6f2c..f1e81e7 100644 --- a/avahi-compat-howl/text-test.c +++ b/avahi-compat-howl/text-test.c @@ -36,7 +36,7 @@ static void hexdump(const void* p, size_t size) { const uint8_t *c = p; assert(p); - printf("Dumping %u bytes from %p:\n", size, p); + printf("Dumping %zu bytes from %p:\n", size, p); while (size > 0) { unsigned i; @@ -77,7 +77,7 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { ASSERT_SW_OKAY(sw_text_record_add_string(r, "foo=bar")); ASSERT_SW_OKAY(sw_text_record_add_string(r, "waldo=baz")); ASSERT_SW_OKAY(sw_text_record_add_key_and_string_value(r, "quux", "nimpf")); - ASSERT_SW_OKAY(sw_text_record_add_key_and_binary_value(r, "quux", "\0\0\0\0", 4)); + ASSERT_SW_OKAY(sw_text_record_add_key_and_binary_value(r, "quux", (void*) "\0\0\0\0", 4)); hexdump(sw_text_record_bytes(r), sw_text_record_len(r)); diff --git a/avahi-python/avahi-discover/Makefile.am b/avahi-python/avahi-discover/Makefile.am index 7a16472..a493a25 100644 --- a/avahi-python/avahi-discover/Makefile.am +++ b/avahi-python/avahi-discover/Makefile.am @@ -53,13 +53,13 @@ avahi_discover_PYTHON += __init__.py endif avahi-discover.desktop.in: avahi-discover.desktop.in.in - sed -e 's,@bindir\@,$(bindir),g' $< > $@ + $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@ avahi-discover: avahi-discover.in - sed -e 's,@PYTHON\@,$(PYTHON),g' \ + $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -e 's,@GETTEXT_PACKAGE\@,"$(GETTEXT_PACKAGE)",g' \ -e 's,@LOCALEDIR\@,"$(datadir)/locale",g' \ - -e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@ + -e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@ && \ chmod +x $@ bin_SCRIPTS = $(pythonscripts) diff --git a/avahi-sharp/Makefile.am b/avahi-sharp/Makefile.am index 43ab428..d8f1fab 100644 --- a/avahi-sharp/Makefile.am +++ b/avahi-sharp/Makefile.am @@ -48,11 +48,11 @@ EXTRA_DIST = \ $(srcdir)/gencfg.sh $(ASSEMBLY): $(AVAHISOURCES) - mcs -keyfile:$(srcdir)/avahi.snk -target:library -out:$@ -debug $(AVAHISOURCES) -r:Mono.Posix + $(AM_V_GEN)mcs -keyfile:$(srcdir)/avahi.snk -target:library -out:$@ -debug $(AVAHISOURCES) -r:Mono.Posix $(ASSEMBLY).config: $(ASSEMBLY).config.in - $(srcdir)/gencfg.sh $(top_builddir)/avahi-client/libavahi-client.la \ + $(AM_V_GEN)$(srcdir)/gencfg.sh $(top_builddir)/avahi-client/libavahi-client.la \ $(top_builddir)/avahi-common/libavahi-common.la \ $(top_builddir)/avahi-glib/libavahi-glib.la < $< > $@ @@ -62,12 +62,12 @@ all: $(ASSEMBLY) $(ASSEMBLY).config if HAVE_MONODOC update-docs: $(ASSEMBLY) - $(MONODOCER) -assembly:$(ASSEMBLY) -path:en + $(AM_V_GEN)$(MONODOCER) -assembly:$(ASSEMBLY) -path:en avahi-sharp-docs.zip: avahi-sharp-docs.tree avahi-sharp-docs.tree: $(srcdir)/en/*/* - $(MDASSEMBLER) --out avahi-sharp-docs --ecma $(srcdir)/en + $(AM_V_GEN)$(MDASSEMBLER) --out avahi-sharp-docs --ecma $(srcdir)/en monodocdir = $(MONODOC_DIR) monodoc_DATA = avahi-sharp-docs.zip avahi-sharp-docs.tree avahi-sharp-docs.source @@ -75,10 +75,10 @@ monodoc_DATA = avahi-sharp-docs.zip avahi-sharp-docs.tree avahi-sharp-docs.sourc endif install-data-hook: $(ASSEMBLY) - $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) + $(AM_V_GEN)$(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) uninstall-hook: $(ASSEMBLY) - $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) + $(AM_V_GEN)$(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) endif endif diff --git a/avahi-ui-sharp/Makefile.am b/avahi-ui-sharp/Makefile.am index 6183f48..e8cf23f 100644 --- a/avahi-ui-sharp/Makefile.am +++ b/avahi-ui-sharp/Makefile.am @@ -34,13 +34,13 @@ EXTRA_DIST = \ $(srcdir)/bssh.cs $(ASSEMBLY): $(AVAHISOURCES) - mcs -keyfile:$(top_srcdir)/avahi-sharp/avahi.snk -target:library -out:$@ -debug $(AVAHISOURCES) -pkg:gtk-sharp-2.0 -r:$(top_builddir)/avahi-sharp/avahi-sharp.dll -r:Mono.Posix + $(AM_V_GEN)mcs -keyfile:$(top_srcdir)/avahi-sharp/avahi.snk -target:library -out:$@ -debug $(AVAHISOURCES) -pkg:gtk-sharp-2.0 -r:$(top_builddir)/avahi-sharp/avahi-sharp.dll -r:Mono.Posix $(ASSEMBLY).config: $(ASSEMBLY).config.in - $(srcdir)/gencfg.sh $(top_builddir)/avahi-common/libavahi-common.la < $< > $@ + $(AM_V_GEN)$(srcdir)/gencfg.sh $(top_builddir)/avahi-common/libavahi-common.la < $< > $@ bssh.exe: $(srcdir)/bssh.cs $(ASSEMBLY) - mcs -out:$@ $(srcdir)/bssh.cs -r:./avahi-ui-sharp.dll -r:../avahi-sharp/avahi-sharp.dll -pkg:gtk-sharp-2.0 -r:Mono.Posix + $(AM_V_GEN)mcs -out:$@ $(srcdir)/bssh.cs -r:./avahi-ui-sharp.dll -r:../avahi-sharp/avahi-sharp.dll -pkg:gtk-sharp-2.0 -r:Mono.Posix if HAVE_MONO if HAVE_DBUS @@ -49,12 +49,12 @@ all: $(ASSEMBLY) $(ASSEMBLY).config bssh.exe if HAVE_MONODOC update-docs: $(ASSEMBLY) - $(MONODOCER) -assembly:$(ASSEMBLY) -path:en + $(AM_V_GEN)$(MONODOCER) -assembly:$(ASSEMBLY) -path:en avahi-ui-sharp-docs.zip: avahi-ui-sharp-docs.tree avahi-ui-sharp-docs.tree: $(srcdir)/en/*/* - $(MDASSEMBLER) --out avahi-ui-sharp-docs --ecma $(srcdir)/en + $(AM_V_GEN)$(MDASSEMBLER) --out avahi-ui-sharp-docs --ecma $(srcdir)/en monodocdir = $(MONODOC_DIR) monodoc_DATA = avahi-ui-sharp-docs.zip avahi-ui-sharp-docs.tree avahi-ui-sharp-docs.source diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am index 6dbbd24..8b37333 100644 --- a/avahi-ui/Makefile.am +++ b/avahi-ui/Makefile.am @@ -1,7 +1,7 @@ # $Id$ # # This file is part of avahi. -# +# # avahi is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as # published by the Free Software Foundation; either version 2 of the @@ -23,7 +23,7 @@ AM_CFLAGS=-I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -D AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' desktopdir = $(datadir)/applications -desktop_DATA = +desktop_DATA = desktop_DATA_in = $(desktop_DATA_in_in:.in.in=.in) desktop_DATA_in_in = bssh.desktop.in.in bvnc.desktop.in.in @@ -40,7 +40,7 @@ avahiinclude_HEADERS = \ avahi-ui.h lib_LTLIBRARIES = \ - libavahi-ui.la + libavahi-ui.la libavahi_ui_la_SOURCES = \ avahi-ui.h avahi-ui.c @@ -74,10 +74,10 @@ install-exec-local: $(LN_S) bssh bshell bssh.desktop.in: bssh.desktop.in.in - sed -e 's,@bindir\@,$(bindir),g' $< > $@ + $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@ bvnc.desktop.in: bvnc.desktop.in.in - sed -e 's,@bindir\@,$(bindir),g' $< > $@ + $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@ endif # HAVE_GLIB endif diff --git a/avahi-ui/avahi-ui.c b/avahi-ui/avahi-ui.c index 2e8f327..51f6b22 100644 --- a/avahi-ui/avahi-ui.c +++ b/avahi-ui/avahi-ui.c @@ -30,7 +30,6 @@ #include #include -#include #include #include diff --git a/avahi-ui/bssh.c b/avahi-ui/bssh.c index e4a190b..9712ee8 100644 --- a/avahi-ui/bssh.c +++ b/avahi-ui/bssh.c @@ -31,7 +31,6 @@ #include #include -#include #include #include -- 2.39.5