X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=build%2Fmod.mk;h=457b1365401c0e02f529e1af0f39c9b98b41cf76;hb=cb8b86e7ceb0fc54c8b6cfd71e59679f3e51757f;hp=af33d84c9770f0e4e020e451fae7bd949bad13cd;hpb=3d1dc1b90b86a33657d40bd9abef3a56e7887e9c;p=openldap

diff --git a/build/mod.mk b/build/mod.mk
index af33d84c97..457b136540 100644
--- a/build/mod.mk
+++ b/build/mod.mk
@@ -1,4 +1,5 @@
-## Copyright 1998,1999 The OpenLDAP Foundation
+# $OpenLDAP$
+## Copyright 1998-2002 The OpenLDAP Foundation
 ## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
 ## of this package for details.
 ##---------------------------------------------------------------------------
@@ -9,93 +10,72 @@
 LIBRARY = $(LIBBASE).la
 LIBSTAT = lib$(LIBBASE).a
 
-all-common: FORCE
-	@if test "$(BUILD_MOD)" = "yes"; then \
-		$(MAKE) $(MFLAGS) LTFLAGS=--only-shared all-mod; \
-	elif test "$(BUILD_LIB)" = "yes" ; then \
-		$(MAKE) $(MFLAGS) LTFLAGS=--only-static all-lib; \
-	else \
-		echo "run configure with $(BUILD_OPT) to build $(LIBBASE)"; \
-	fi
+MKDEPFLAG = -l
+
+.SUFFIXES: .c .o .lo
+
+.c.lo:
+	$(LTCOMPILE_MOD) $<
+
+all-no lint-no 5lint-no depend-no install-no: FORCE
+	@echo "run configure with $(BUILD_OPT) to make $(LIBBASE)"
+
+all-common: all-$(BUILD_MOD)
 
 version.c: $(OBJS)
 	$(RM) $@
 	$(MKVERSION) $(LIBBASE) > $@
 
 $(LIBRARY): version.lo
-	$(LTLIBLINK) -module -rpath $(moduledir) -o $@ $(OBJS) version.lo
+	$(LTLINK_MOD) -module -o $@ $(OBJS) version.lo $(LINK_LIBS)
 
 $(LIBSTAT): version.lo
-	$(AR) ruv $@ `echo $(OBJS) | sed s/\.lo/.o/g` version.o
+	$(AR) ruv $@ `echo $(OBJS) | sed 's/\.lo/.o/g'` version.o
 	@$(RANLIB) $@
 
 clean-common: clean-lib FORCE
 veryclean-common: veryclean-lib FORCE
 
-lint-common: FORCE
-	@if test "$(BUILD_LIB)" = "yes" ; then \
-		$(MAKE) $(MFLAGS) lint-lib; \
-	else \
-		echo "run configure with $(BUILD_OPT) to lint $(LIBBASE)"; \
-	fi
-
-5lint-common: FORCE
-	@if test "$(BUILD_LIB)" = "yes" ; then \
-		$(MAKE) $(MFLAGS) 5lint-lib; \
-	else \
-		echo "run configure with $(BUILD_OPT) to 5lint $(LIBBASE)"; \
-	fi
-
-depend-common: FORCE
-	@if test "$(BUILD_LIB)" = "yes" ; then \
-		$(MAKE) $(MFLAGS) depend-lib; \
-	else \
-		echo "run configure with $(BUILD_OPT) to depend $(LIBBASE)"; \
-	fi
-
-install-common: FORCE
-	@if test "$(BUILD_MOD)" = "yes" ; then \
-		$(MAKE) $(MFLAGS) install-mod; \
-	elif test "$(BUILD_LIB)" = "yes" ; then \
-		$(MAKE) $(MFLAGS) install-lib; \
-	else \
-		echo "run configure with $(BUILD_OPT) to install $(LIBBASE)"; \
-	fi
+
+lint-common: lint-$(BUILD_MOD)
+
+5lint-common: 5lint-$(BUILD_MOD)
+
+depend-common: depend-$(BUILD_MOD)
+
+install-common: install-$(BUILD_MOD)
 
 all-local-mod:
 all-mod: $(LIBRARY) all-local-mod FORCE
 
 all-local-lib:
-all-lib: $(LIBSTAT) all-local-lib FORCE
+all-yes: $(LIBSTAT) all-local-lib FORCE
 
 install-mod: $(LIBRARY)
-	@-$(MKDIR) $(moduledir)
-	$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(moduledir)
+	@-$(MKDIR) $(DESTDIR)$(moduledir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(moduledir)
 
 install-local-lib:
-install-lib: install-local-lib FORCE
+install-yes: install-local-lib FORCE
 
 lint-local-lib:
-lint-lib: lint-local-lib FORCE
+lint-yes lint-mod: lint-local-lib FORCE
 	$(LINT) $(DEFS) $(DEFINES) $(SRCS)
 
 5lint-local-lib:
-5lint-lib: 5lint-local-lib FORCE
+5lint-yes 5lint-mod: 5lint-local-lib FORCE
 	$(5LINT) $(DEFS) $(DEFINES) $(SRCS)
 
 clean-local-lib:
 clean-lib: 	clean-local-lib FORCE
-	$(RM) $(LIBRARY) $(LIBSTAT) $(MODULE) *.o *.lo a.out core .libs/*
+	$(RM) $(LIBRARY) $(LIBSTAT) version.c *.o *.lo a.out core .libs/*
 
 depend-local-lib:
-depend-lib: depend-local-lib FORCE
-
-COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) -c
-MKDEPFLAG = -l
+depend-yes depend-mod: depend-local-lib FORCE
+	$(MKDEP) $(DEFS) $(DEFINES) $(SRCS)
 
-.SUFFIXES: .c .o .lo
-
-.c.lo:
-	$(COMPILE) $<
+veryclean-local-lib:
+veryclean-lib: 	clean-lib veryclean-local-lib
 
 Makefile: $(top_srcdir)/build/mod.mk
+