diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-05-20 11:54:52 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-05-20 11:54:52 +0100 |
| commit | 7e6b2d33b287c9b6d743f7a0d1f6463e4e582c44 (patch) | |
| tree | e805e504a6e1a15159ef8f2a8976ed147e95689f /lib | |
| parent | 4cd65645628c1b3a16cc84225833b67e9876e8ed (diff) | |
| download | telepathy-salut-7e6b2d33b287c9b6d743f7a0d1f6463e4e582c44.tar.gz | |
Revert "Shave salut's build."
This reverts commit 99cc66bb81516ad87657e8d49e286502bba63f69.
Conflicts:
lib/gibber/Makefile.am
src/Makefile.am
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gibber/Makefile.am | 12 | ||||
| -rw-r--r-- | lib/gibber/examples/Makefile.am | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lib/gibber/Makefile.am b/lib/gibber/Makefile.am index ed472fb0..bec4168b 100644 --- a/lib/gibber/Makefile.am +++ b/lib/gibber/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/tools/shave.mk - SUBDIRS = examples tests noinst_LTLIBRARIES = libgibber.la @@ -111,7 +109,7 @@ dist-hook: $(shell for x in $(BUILT_SOURCES); do rm -f $(distdir)/$$x ; done) gibber-signals-marshal.list: $(HANDWRITTEN_SOURCES) Makefile.am - $(QUIET_GEN)( cd $(srcdir) && \ + ( cd $(srcdir) && \ sed -n -e 's/.*_gibber_signals_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \ $(HANDWRITTEN_SOURCES) ) \ | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp @@ -122,10 +120,10 @@ gibber-signals-marshal.list: $(HANDWRITTEN_SOURCES) Makefile.am fi %-signals-marshal.h: %-signals-marshal.list Makefile.am - $(QUIET_GEN)glib-genmarshal --header --prefix=_$(subst -,_,$*)_signals_marshal $< > $@ + glib-genmarshal --header --prefix=_$(subst -,_,$*)_signals_marshal $< > $@ %-signals-marshal.c: %-signals-marshal.list Makefile.am - $(QUIET_GEN){ echo '#include "$*-signals-marshal.h"' && \ + { echo '#include "$*-signals-marshal.h"' && \ glib-genmarshal --body --prefix=_$(subst -,_,$*)_signals_marshal $< ; \ } > $@ @@ -152,7 +150,7 @@ endif # rules for making the glib enum objects %-enumtypes.h: %.h Makefile.in - $(QUIET_GEN)glib-mkenums \ + glib-mkenums \ --fhead "#ifndef __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \ --vhead "GType @enum_name@_get_type (void);\n#define $(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ @@ -160,7 +158,7 @@ endif $< > $@ %-enumtypes.c: %.h Makefile.in - $(QUIET_GEN)glib-mkenums \ + glib-mkenums \ --fhead "#include <$*.h>\n#include <$*-enumtypes.h>" \ --fprod "\n/* enumerations from \"@filename@\" */" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ diff --git a/lib/gibber/examples/Makefile.am b/lib/gibber/examples/Makefile.am index 153ff992..7e537d75 100644 --- a/lib/gibber/examples/Makefile.am +++ b/lib/gibber/examples/Makefile.am @@ -1,11 +1,9 @@ -include $(top_srcdir)/tools/shave.mk - # All examples use SSL, so don't build anything if it's unavailable if HAVE_LIBSSL # Teach it how to make libgibber.la $(top_builddir)/lib/gibber/libgibber.la: - $(QUIET_GEN)${MAKE} -C $(top_builddir)/lib/gibber libgibber.la + ${MAKE} -C $(top_builddir)/lib/gibber libgibber.la .PHONY: $(top_builddir)/lib/gibber/libgibber.la |