]> git.codecow.com Git - Monocypher.git/commitdiff
Moved libhydrogen pkg-config file to the makefile
authorLoup Vaillant <loup@loup-vaillant.fr>
Fri, 25 Oct 2019 17:53:09 +0000 (19:53 +0200)
committerLoup Vaillant <loup@loup-vaillant.fr>
Fri, 25 Oct 2019 17:53:09 +0000 (19:53 +0200)
That's the simplest way I know of to respect the PREFIX variable.

makefile
tests/externals/libhydrogen.pc [deleted file]

index 684a6e2f883b9b2fe0eb02177884a76b9ce00c2c..a9496e944ca4ad336a92db99cbb6cdf69a23d31e 100644 (file)
--- a/makefile
+++ b/makefile
@@ -44,9 +44,22 @@ install-doc:
        mkdir -p $(MAN_DIR)
        cp -r doc/man/man3/*.3monocypher $(MAN_DIR)
 
-pkg-config-libhydrogen: tests/externals/libhydrogen.pc
+pkg-config-libhydrogen:
        mkdir -p $(PKGCONFIG)
-       cp $< $(PKGCONFIG)/libhydrogen.pc
+       @echo "Creating $(PKGCONFIG)/libhydrogen.pc"
+       @echo "prefix=/$(PREFIX)"               > $(PKGCONFIG)/libhydrogen.pc
+       @echo 'exec_prefix=$${prefix}'         >> $(PKGCONFIG)/libhydrogen.pc
+       @echo 'libdir=$${exec_prefix}/lib'     >> $(PKGCONFIG)/libhydrogen.pc
+       @echo 'includedir=$${prefix}/include'  >> $(PKGCONFIG)/libhydrogen.pc
+       @echo ''                               >> $(PKGCONFIG)/libhydrogen.pc
+       @echo 'Name: libhydrogen'              >> $(PKGCONFIG)/libhydrogen.pc
+       @echo 'Version: git-HEAD'              >> $(PKGCONFIG)/libhydrogen.pc
+       @echo 'Description: Small, easy-to-use,'      \
+              'hard-to-misuse cryptographic library.' \
+                                               >> $(PKGCONFIG)/libhydrogen.pc
+       @echo ''                               >> $(PKGCONFIG)/libhydrogen.pc
+       @echo 'Libs: -L$${libdir} -lhydrogen'  >> $(PKGCONFIG)/libhydrogen.pc
+       @echo 'Cflags: -I$${includedir}'       >> $(PKGCONFIG)/libhydrogen.pc
 
 library: static-library dynamic-library
 static-library : lib/libmonocypher.a
diff --git a/tests/externals/libhydrogen.pc b/tests/externals/libhydrogen.pc
deleted file mode 100644 (file)
index 932562a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr/local
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: libhydrogen
-Version: git-f1f061d
-Description: Small, easy-to-use, hard-to-misuse cryptographic library.
-
-Libs: -L${libdir} -lhydrogen
-Cflags: -I${includedir}