change build parts include

diff --git a/Makefile b/Makefile
index 234a8a5e4b2962713ff9d616345addf17157c124..876564179c0c70ae627c56d4d2359fd71c7aae5a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,8 +30,17 @@ clean:
 
 ################################################################################
 
+$(BUILDDIR)/parts/scanbasic.sh: \
+       $(SRCDIR)/scanbasic.sh
+
+       mkdir -p $(@D)
+       ./tools/includer $(SRCDIR)/scanbasic.sh \
+               > $(BUILDDIR)/parts/scanbasic.sh
+
+################################################################################
+
 $(PACKAGEDIR)/$(BINDIR)/scantopdf: \
-       $(SRCDIR)/scanbasic.sh \
+       $(BUILDDIR)/parts/scanbasic.sh \
        $(SRCDIR)/scantopdf
 
        mkdir -p $(@D)
@@ -41,7 +50,7 @@ $(PACKAGEDIR)/$(BINDIR)/scantopdf: \
        chmod 755 $(PACKAGEDIR)/$(BINDIR)/scantopdf
 
 $(PACKAGEDIR)/$(BINDIR)/scantopdfgray: \
-       $(SRCDIR)/scanbasic.sh \
+       $(BUILDDIR)/parts/scanbasic.sh \
        $(SRCDIR)/scantopdfgray
 
        mkdir -p $(@D)
@@ -51,7 +60,7 @@ $(PACKAGEDIR)/$(BINDIR)/scantopdfgray: \
        chmod 755 $(PACKAGEDIR)/$(BINDIR)/scantopdfgray
 
 $(PACKAGEDIR)/$(BINDIR)/scantopdfbw: \
-       $(SRCDIR)/scanbasic.sh \
+       $(BUILDDIR)/parts/scanbasic.sh \
        $(SRCDIR)/scantopdfbw
 
        mkdir -p $(@D)

diff --git a/src/scantopdf b/src/scantopdf
index 2295f737ac17e7d1ed4c17c02f89b7466a6fd956..a157dc4a533b58217fceff313958db0fb4b55afc 100755 (executable)
--- a/src/scantopdf
+++ b/src/scantopdf
@@ -1,5 +1,5 @@
 #!/bin/bash
-#include "scanbasic.sh"
+#include "../build/parts/scanbasic.sh"
 
 main()
 {

diff --git a/src/scantopdfbw b/src/scantopdfbw
index b3b07867e555b6951b9b9b42327224b23d567b3d..8247ef2b9765a5053c7d67addf9f67b462f823d1 100755 (executable)
--- a/src/scantopdfbw
+++ b/src/scantopdfbw
@@ -1,5 +1,5 @@
 #!/bin/bash
-#include "scanbasic.sh"
+#include "../build/parts/scanbasic.sh"
 
 main()
 {

diff --git a/src/scantopdfgray b/src/scantopdfgray
index e3741daf887c1eb497b5107a3cdba9da39668b1b..70d05e2c4889241e1248dfd822950469a251c8e2 100755 (executable)
--- a/src/scantopdfgray
+++ b/src/scantopdfgray
@@ -1,5 +1,5 @@
 #!/bin/bash
-#include "scanbasic.sh"
+#include "../build/parts/scanbasic.sh"
 
 main()
 {

diff --git a/tests/scanbasic.bats b/tests/scanbasic.bats
index 6eb67cdecc99dc11deb95a842e972714d12af410..481c9d92daa7921870aaf3914825c7d90ea86c75 100755 (executable)
--- a/tests/scanbasic.bats
+++ b/tests/scanbasic.bats
@@ -4,7 +4,7 @@ setup() {
        load "/usr/lib/bats/bats-assert/load"
        load "/usr/lib/bats/bats-support/load"
 
-       source ./src/scanbasic.sh
+       source ./build/parts/scanbasic.sh
 }
 
 @test "should failure optimize input parameter is missing" {