ruby: be consistent with notmuch's coding style

[notmuch] / lib / Makefile.local

diff --git a/lib/Makefile.local b/lib/Makefile.local
index eaa8af42b6066c5cbf63c26a5ebc15a355d21102..8098432979479b84c678718e8b1f31052d9f386f 100644 (file)
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -17,7 +17,7 @@ LIBNOTMUCH_VERSION_MAJOR = 1
 # the time of release for any additions to the library interface,
 # (and when it is incremented, the release version of the library should
 #  be reset to 0).
-LIBNOTMUCH_VERSION_MINOR = 3
+LIBNOTMUCH_VERSION_MINOR = 4
 
 # The release version the library interface. This should be incremented at
 # the time of release if there have been no changes to the interface, (but
@@ -72,14 +72,10 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
        $(call quiet,AR) rcs $@ $^
 
 $(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym
-       echo $(libnotmuch_modules)
        $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@
 
-notmuch.sym: lib/notmuch.h
-       gcc -aux-info notmuch.aux $<
-       printf "{\nglobal:\n" > notmuch.sym
-       sed  -n 's/.*\(notmuch_[a-z_]*\) (.*/\t\1;/p' notmuch.aux >> notmuch.sym
-       printf "local: *;\n};\n" >> notmuch.sym
+notmuch.sym: lib/notmuch.h $(libnotmuch_modules)
+       sh lib/gen-version-script.sh $< $(libnotmuch_modules) > $@
 
 $(dir)/$(SONAME): $(dir)/$(LIBNAME)
        ln -sf $(LIBNAME) $@
@@ -104,5 +100,5 @@ install-$(dir): $(dir)/$(LIBNAME)
 
 SRCS  := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs)
 CLEAN += $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/$(LINKER_NAME)
-CLEAN += $(dir)/$(LIBNAME) $(dir)/libnotmuch.a notmuch.aux notmuch.sym
+CLEAN += $(dir)/$(LIBNAME) $(dir)/libnotmuch.a notmuch.sym
 CLEAN += $(dir)/notmuch.h.gch