update libvoro++ patch

This commit is contained in:
Axel Kohlmeyer
2025-06-04 12:20:29 -04:00
parent ba8dd4d380
commit b73f78ea88

View File

@ -1,35 +1,35 @@
--- Makefile.orig 2025-06-04 12:03:44.294110829 -0400
+++ Makefile 2025-06-04 12:06:08.567902578 -0400
@@ -5,7 +5,7 @@
# Date : August 30th 2011
--- Makefile.orig 2025-06-04 12:16:01.056286325 -0400
+++ Makefile 2025-06-04 12:18:47.454879006 -0400
@@ -11,8 +11,7 @@
# Tell make that these are phony targets
-.PHONY: all help clean install uninstall
+.PHONY: all lib help clean install uninstall
# Build all of the executable files
all:
- $(MAKE) -C src
- $(MAKE) -C examples
+ $(MAKE) -C src depend libvoro++.a
include config.mk
@@ -14,6 +14,10 @@
$(MAKE) -C src
$(MAKE) -C examples
+# Build only the library
+lib:
+ $(MAKE) -C lib
+
# Build the help files (with Doxygen)
help:
$(MAKE) -C src help
@@ -32,7 +36,6 @@
@@ -24,16 +23,12 @@
$(MAKE) -C examples clean
# Install the executable, man page, and shared library
-install:
- $(MAKE) -C src
- $(INSTALL) -d $(IFLAGS_EXEC) $(PREFIX)/bin
+install: all
$(INSTALL) -d $(IFLAGS_EXEC) $(PREFIX)/lib
$(INSTALL) -d $(IFLAGS_EXEC) $(PREFIX)/man
$(INSTALL) -d $(IFLAGS_EXEC) $(PREFIX)/man/man1
$(INSTALL) -d $(IFLAGS_EXEC) $(PREFIX)/include
$(INSTALL) -d $(IFLAGS_EXEC) $(PREFIX)/include/voro++
- $(INSTALL) $(IFLAGS_EXEC) src/voro++ $(PREFIX)/bin
$(INSTALL) $(IFLAGS) man/voro++.1 $(PREFIX)/man/man1
- $(INSTALL) $(IFLAGS) man/voro++.1 $(PREFIX)/man/man1
$(INSTALL) $(IFLAGS) src/libvoro++.a $(PREFIX)/lib
$(INSTALL) $(IFLAGS) src/voro++.hh $(PREFIX)/include/voro++
--- src/Makefile.orig 2025-06-04 12:06:20.968102411 -0400
+++ src/Makefile 2025-06-04 12:06:38.238762875 -0400
$(INSTALL) $(IFLAGS) src/c_loops.hh $(PREFIX)/include/voro++
--- src/Makefile.orig 2013-10-17 13:54:13.000000000 -0400
+++ src/Makefile 2025-06-04 12:16:47.293104880 -0400
@@ -10,10 +10,10 @@
# List of the common source files
objs=cell.o common.o container.o unitcell.o v_compute.o c_loops.o \