X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lib%2FMakefile.darwin-lib;h=c94a5e72195a1f19b89a4e0c152b2b138c80f6bc;hb=30ac1ce7df719e40b0c3c612696ada7c9ebbaed2;hp=c9e44cc55f9ae5d175174bf0979c728c53d35c64;hpb=3f546fcc27e9bfca8d365c4d78c6e6c99ca32512;p=tools%2Fe2fsprogs.git

diff --git a/lib/Makefile.darwin-lib b/lib/Makefile.darwin-lib
index c9e44cc..c94a5e7 100644
--- a/lib/Makefile.darwin-lib
+++ b/lib/Makefile.darwin-lib
@@ -10,11 +10,11 @@
 # BSDLIB_INSTALL_DIR = $(SHLIBDIR)
 #
 
-all:: pic image
+all:: image
 
 real-subdirs:: Makefile
-	@echo "	MKDIR pic"
-	@mkdir -p pic
+	$(E) "	MKDIR pic"
+	$(Q) mkdir -p pic
 
 BSD_LIB = $(BSDLIB_IMAGE).$(BSDLIB_VERSION).dylib
 BSDLIB_PIC_FLAG = -fPIC
@@ -22,19 +22,20 @@ BSDLIB_PIC_FLAG = -fPIC
 image:		$(BSD_LIB)
 
 $(BSD_LIB): $(OBJS)
-	@echo "	GEN_BSD_SOLIB $(BSD_LIB)"
-	@(cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \
+	$(E) "	GEN_BSD_SOLIB $(BSD_LIB)"
+	$(Q) (cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \
 		-flat_namespace -undefined warning -o $(BSD_LIB) $(OBJS))
-	@$(MV) pic/$(BSD_LIB) .
-	@$(RM) -f ../$(BSD_LIB)
-	@$(LN) $(BSD_LIB) ../$(BSD_LIB)
-	@$(LN) ../$(BSD_LIB) ../$(BSDLIB_IMAGE).dylib
+	$(Q) $(MV) pic/$(BSD_LIB) .
+	$(Q) $(RM) -f ../$(BSD_LIB)
+	$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \
+		`echo $(my_dir) | sed -e 's;lib/;;'`/$(BSD_LIB) $(BSD_LIB))
+	$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(BSD_LIB) $(BSDLIB_IMAGE).dylib)
 
 install-shlibs install:: $(BSD_LIB)
-	@echo "	INSTALL_PROGRAM $(BSDLIB_INSTALL_DIR)/$(BSD_LIB)"
-	@$(INSTALL_PROGRAM) $(BSD_LIB) \
+	$(E) "	INSTALL_PROGRAM $(BSDLIB_INSTALL_DIR)/$(BSD_LIB)"
+	$(Q) $(INSTALL_PROGRAM) $(BSD_LIB) \
 		$(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
-	@-$(LDCONFIG)
+	-$(Q) $(LDCONFIG)
 
 install-strip: install