X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=79ac50d4ff555b736a3d78fcfb89843839ed50e0;hp=9a1d055bd78822d2d15c3f292eb9ae8379974aed;hb=8c8079a8b14fac5e8ca6b682e5c76e08a824f2e7;hpb=452fbedcd5db101378b01c957a7f0574eb708afc

diff --git a/Makefile.local b/Makefile.local
index 9a1d055b..79ac50d4 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -19,25 +19,6 @@ TAR_FILE=$(PACKAGE)-$(VERSION).tar.gz
 SHA1_FILE=$(TAR_FILE).sha1
 GPG_FILE=$(SHA1_FILE).asc
 
-# Get settings from the output of configure by running it to generate
-# Makefile.config if it doesn't exist yet. And add Makefile.config to
-# our global dependency list.
-include Makefile.config
-global_deps += Makefile.config
-Makefile.config: configure
-	@echo ""
-	@echo "Note: Calling ./configure with no command-line arguments. This is often fine,"
-	@echo "      but if you want to specify any arguments (such as an alternate prefix"
-	@echo "      into which to install), call ./configure explicitly and then make again."
-	@echo "      See \"./configure --help\" for more details."
-	@echo ""
-	./configure
-
-# Sub-directory Makefile.local fragments can append to these variables
-# to have directory-specific cflags as necessary.
-extra_cflags :=
-extra_cxxflags :=
-
 # Smash together user's values with our extra values
 FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
 FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
@@ -193,7 +174,6 @@ clean:
 distclean: clean
 
 notmuch_client_srcs =		\
-	$(notmuch_compat_srcs)	\
 	debugger.c		\
 	gmime-filter-reply.c	\
 	gmime-filter-headers.c	\
@@ -217,10 +197,10 @@ notmuch_client_srcs =		\
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 
 notmuch: $(notmuch_client_modules) lib/libnotmuch.a
-	$(call quiet,CC $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
+	$(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
 
-notmuch-shared: $(notmuch_client_modules) lib/libnotmuch.so
-	$(call quiet,CC $(CFLAGS)) $(notmuch_client_modules) $(FINAL_NOTMUCH_LDFLAGS) -o $@
+notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME)
+	$(call quiet,CXX $(CFLAGS)) $(notmuch_client_modules) $(FINAL_NOTMUCH_LDFLAGS) -o $@
 
 notmuch.1.gz: notmuch.1
 	gzip --stdout $^ > $@