Просмотр исходного кода

Make mkit movable to other dir

 *  Move targets to mkit/mkit.mk,
 *  make `mkit/make` and rest of mkit use MKIT_DIR for own path.
Alois Mahdal 10 лет назад
Родитель
Сommit
6689da6f32
5 измененных файлов: 53 добавлений и 42 удалений
  1. 3
    35
      Makefile
  2. 1
    1
      mkit/include/build.sh
  3. 5
    5
      mkit/include/mkit.sh
  4. 3
    1
      mkit/make
  5. 41
    0
      mkit/mkit.mk

+ 3
- 35
Makefile Просмотреть файл

@@ -3,42 +3,10 @@
3 3
 
4 4
 include config.mk
5 5
 
6
-all: options build
7
-
8
-options:
9
-	@echo ffoo build options:
10
-	@echo "VERSION  = ${VERSION}"
11
-	@echo "PRERELEASE = ${PRERELEASE}"
12
-	@echo "PREFIX   = ${PREFIX}"
13
-
14
-build:
15
-	@mkit/make build
16
-
17
-manpages: build
18
-	@mkit/make build_manpages
19
-
20
-clean:
21
-	@mkit/make clean
22
-
23
-dist: clean
24
-	@mkit/make dist
25
-
26
-install: all
27
-	@mkit/make install
28
-
29
-release_x:
30
-	@mkit/make release_x
31
-
32
-release_y:
33
-	@mkit/make release_y
34
-
35
-release_z:
36
-	@mkit/make release_z
6
+MKIT_DIR=mkit
7
+include $(MKIT_DIR)/mkit.mk
37 8
 
38 9
 TF_DIR=utils/tfkit
39 10
 include $(TF_DIR)/tfkit.mk
40 11
 
41
-uninstall:
42
-	@mkit/make uninstall
43
-
44
-.PHONY: all options clean dist install uninstall
12
+.PHONY: test

+ 1
- 1
mkit/include/build.sh Просмотреть файл

@@ -1,6 +1,6 @@
1 1
 #!/bin/bash
2 2
 
3
-. mkit/include/ini.sh || die "cannot import ini.sh"
3
+. $MKIT_DIR/include/ini.sh || die "cannot import ini.sh"
4 4
 
5 5
 
6 6
 build() {

+ 5
- 5
mkit/include/mkit.sh Просмотреть файл

@@ -1,11 +1,11 @@
1 1
 #!/bin/bash
2 2
 
3
-. mkit/include/build.sh  || die "cannot import build.sh"
4
-. mkit/include/deploy.sh || die "cannot import deploy.sh"
5
-. mkit/include/release.sh || die "cannot import release.sh"
6
-. mkit/include/ini.sh    || die "cannot import ini.sh"
3
+. $MKIT_DIR/include/build.sh  || die "cannot import build.sh"
4
+. $MKIT_DIR/include/deploy.sh || die "cannot import deploy.sh"
5
+. $MKIT_DIR/include/release.sh || die "cannot import release.sh"
6
+. $MKIT_DIR/include/ini.sh    || die "cannot import ini.sh"
7 7
 
8
-MKIT_INI=${MKIT_INI:-mkit/config.ini}
8
+MKIT_INI=${MKIT_INI:-$MKIT_DIR/config.ini}
9 9
 MKIT_INI_EXPAND=2
10 10
 MKIT_PKGNAME=$(ini 1value "ENV:PKGNAME")
11 11
 MKIT_PROJNAME=$(ini 1value "ENV:PROJNAME")

+ 3
- 1
mkit/make Просмотреть файл

@@ -6,7 +6,9 @@ die() {
6 6
     echo "$@" && exit 9
7 7
 }
8 8
 
9
-. mkit/include/mkit.sh || die "this must be run from project root"
9
+export MKIT_DIR=${MKIT_DIR:-mkit}
10
+
11
+. $MKIT_DIR/include/mkit.sh || die "failed to init; check if MKIT_DIR is set properly: $MKIT_DIR"
10 12
 
11 13
 configure
12 14
 

+ 41
- 0
mkit/mkit.mk Просмотреть файл

@@ -0,0 +1,41 @@
1
+# ffoo - Fastfoo - Bash dot on steroids
2
+# See LICENSE file for copyright and license details.
3
+
4
+export MKIT_DIR
5
+
6
+all: options build
7
+
8
+options:
9
+	@echo build options:
10
+	@echo "VERSION  = ${VERSION}"
11
+	@echo "PRERELEASE = ${PRERELEASE}"
12
+	@echo "PREFIX   = ${PREFIX}"
13
+
14
+build:
15
+	@$(MKIT_DIR)/make build
16
+
17
+manpages: build
18
+	@$(MKIT_DIR)/make build_manpages
19
+
20
+clean:
21
+	@$(MKIT_DIR)/make clean
22
+
23
+dist: clean
24
+	@$(MKIT_DIR)/make dist
25
+
26
+install: all
27
+	@$(MKIT_DIR)/make install
28
+
29
+release_x:
30
+	@$(MKIT_DIR)/make release_x
31
+
32
+release_y:
33
+	@$(MKIT_DIR)/make release_y
34
+
35
+release_z:
36
+	@$(MKIT_DIR)/make release_z
37
+
38
+uninstall:
39
+	@$(MKIT_DIR)/make uninstall
40
+
41
+.PHONY: all options clean dist install uninstall release_x release_y release_z