Browse Source

split-out binary installation in separate install target

Steffen Jaeckel 8 years ago
parent
commit
3c5ec6b699
2 changed files with 10 additions and 6 deletions
  1. 5 3
      makefile
  2. 5 3
      makefile.shared

+ 5 - 3
makefile

@@ -290,19 +290,21 @@ endif
 ifndef NODOCS
 install: library docs
 else
-install: library $(USEFUL_DEMOS)
+install: library
 endif
 	install -d $(LIBPATH)
 	install -d $(INCPATH)
-	install -d $(BINPATH)
 	install -m 644 $(LIBNAME) $(LIBPATH)
 	install -m 644 $(HEADERS) $(INCPATH)
-	install -m 644 $(USEFUL_DEMOS) $(BINPATH)
 ifndef NODOCS
 	install -d $(DATAPATH)
 	install -m 644 doc/crypt.pdf $(DATAPATH)
 endif
 
+install_bins: $(USEFUL_DEMOS)
+	install -d $(BINPATH)
+	install -m 775 $(USEFUL_DEMOS) $(BINPATH)
+
 install_test: $(LIBTEST)
 	install -d $(LIBPATH)
 	install -d $(INCPATH)

+ 5 - 3
makefile.shared

@@ -239,16 +239,18 @@ $(LIBNAME): $(OBJECTS)
 $(LIBTEST): $(TOBJECTS)
 	$(LT) --mode=link --tag=CC $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) `find ./testprof -type f -name "*.lo"` -o $@ -rpath $(LIBPATH) -version-info $(VERSION_LT)
 
-install: $(LIBNAME) $(USEFUL_DEMOS)
+install: $(LIBNAME)
 	install -d $(LIBPATH)/pkgconfig
 	install -d $(INCPATH)
-	install -d $(BINPATH)
 	$(LT) --mode=install install -c $(LIBNAME) $(LIBPATH)/$(LIBNAME)
 	install -m 644 $(HEADERS) $(INCPATH)
-	install -m 775 $(USEFUL_DEMOS) $(BINPATH)
 	sed -e 's,^prefix=.*,prefix=$(DESTDIR),' -e 's,^Version:.*,Version: $(VERSION),' libtomcrypt.pc.in > $(LIBPATH)/pkgconfig/libtomcrypt.pc
 	install -m 644 libtomcrypt.pc $(LIBPATH)/pkgconfig/libtomcrypt.pc
 
+install_bins: $(USEFUL_DEMOS)
+	install -d $(BINPATH)
+	$(LT) --mode=install install -c $(USEFUL_DEMOS) $(BINPATH)
+
 install_test: $(LIBTEST)
 	install -d $(LIBPATH)
 	install -d $(INCPATH)