aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessandro Iezzi <aiezzi@alessandroiezzi.it>2023-05-27 12:52:45 +0200
committerAlessandro Iezzi <aiezzi@alessandroiezzi.it>2023-05-27 12:52:45 +0200
commitb0a848ab4df53ef32b7207a6ce2c07264365cc5b (patch)
tree228b3254e57d9a7893b88f378835174354420f35
parent9c6d7a4155b785f6ffda76047418ba8e81ca2d9f (diff)
downloadcherry-b0a848ab4df53ef32b7207a6ce2c07264365cc5b.tar.gz
cherry-b0a848ab4df53ef32b7207a6ce2c07264365cc5b.zip
Change the distribution directory
-rw-r--r--Makefile12
-rwxr-xr-xscripts/buildmk.sh12
2 files changed, 12 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 6c5de76..aa65c5d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,17 +3,17 @@
include config.mk
BUILD_DIR = build
-DIST_DIR = dist
+DIST_DIR = build/dist
OBJ = ${BUILD_DIR}/cherry.o ${BUILD_DIR}/main.o ${BUILD_DIR}/window.o ${BUILD_DIR}/application.o ${BUILD_DIR}/event.o ${BUILD_DIR}/widget.o
INCLUDES != find src -name '*.h'
all: static shared
-${DIST_DIR}: all
- mkdir -p $@/include/cherry
- cp ${BUILD_DIR}/release/static/${LIBNAME:=.a} $@/
- cp ${BUILD_DIR}/release/shared/${LIBNAME:=.so} $@/
- cp ${INCLUDES} $@/include/cherry
+dist: all
+ mkdir -p ${DIST_DIR}/include/cherry
+ cp ${BUILD_DIR}/release/static/${LIBNAME:=.a} ${DIST_DIR}/
+ cp ${BUILD_DIR}/release/shared/${LIBNAME:=.so} ${DIST_DIR}/
+ cp ${INCLUDES} ${DIST_DIR}/include/cherry
debug: debug-static debug-shared
diff --git a/scripts/buildmk.sh b/scripts/buildmk.sh
index b85ccf0..2e14c92 100755
--- a/scripts/buildmk.sh
+++ b/scripts/buildmk.sh
@@ -3,7 +3,7 @@
MAKEFILE=Makefile
SRC_DIR=src
BUILD_DIR=build
-DIST_DIR=dist
+DIST_DIR=$BUILD_DIR/dist
# Start composing the Makefile
@@ -24,11 +24,11 @@ INCLUDES != find $SRC_DIR -name '*.h'
all: static shared
-\${DIST_DIR}: all
- mkdir -p \$@/include/cherry
- cp \${BUILD_DIR}/release/static/\${LIBNAME:=.a} \$@/
- cp \${BUILD_DIR}/release/shared/\${LIBNAME:=.so} \$@/
- cp \${INCLUDES} \$@/include/cherry
+dist: all
+ mkdir -p \${DIST_DIR}/include/cherry
+ cp \${BUILD_DIR}/release/static/\${LIBNAME:=.a} \${DIST_DIR}/
+ cp \${BUILD_DIR}/release/shared/\${LIBNAME:=.so} \${DIST_DIR}/
+ cp \${INCLUDES} \${DIST_DIR}/include/cherry
debug: debug-static debug-shared