branch: externals/window-commander
commit 5b0f4657cc856173d6fdbc715e11510355e143e4
Author: Daniel Semyonov <[email protected]>
Commit: Daniel Semyonov <[email protected]>
; Simplify build process
---
Makefile | 39 ++++++++++++++++-----------------------
config.mk | 4 ++--
2 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/Makefile b/Makefile
index e6ea14d246..2483ecd888 100644
--- a/Makefile
+++ b/Makefile
@@ -1,38 +1,31 @@
include config.mk
-.PHONY: info clean
+.PHONY: info package clean
-all: info package
+all: package
help:
- $(info make all - generate info manual)
- $(info make info - generate info manual)
- $(info make package - generate tar file containing the package)
- $(info make clean - remove generated files)
+ $(info make all - generate info manual)
+ $(info make info - generate info manual)
+ $(info make package - generate tar file containing the package)
+ $(info make clean - remove generated files)
@exit
-info: $(PKG).info dir
-
%.info: %.texi
- @echo "Generating $@"
- @$(MAKEINFO) --no-split $< -o $@
+ $(MAKEINFO) --no-split $< -o $@
dir: $(PKG).info
- @echo "Generating $@"
- @$(INSTALLINFO) $< $@
+ $(INSTALLINFO) $< $@
-package: $(PKG)-$(VERSION).tar
+info: $(PKG).info dir
%.tar: $(PKG).info dir *.el LICENSE
- @echo "Creating temporary package directory"
- @mkdir $(PKG)-$(VERSION)
- @echo "Copying package files to temporary directory"
- @cp -a $^ $(PKG)-$(VERSION)/
- @echo "Creating package archive $@"
- @tar -cf $@ $(PKG)-$(VERSION)
- @echo "Removing temporary package directory"
- @rm -rf $(PKG)-$(VERSION)
+ mkdir $(PKG)-$(VERSION)
+ cp -a $^ $(PKG)-$(VERSION)/
+ tar -cf $@ $(PKG)-$(VERSION)
+ rm -rf $(PKG)-$(VERSION)
+
+package: $(PKG)-$(VERSION).tar
clean:
- @echo "Cleaning..."
- @rm -rf $(PKG).info dir $(PKG)-$(VERSION).tar
+ rm -rf $(PKG).info dir $(PKG)-$(VERSION).tar
diff --git a/config.mk b/config.mk
index 2feafc20f1..be6d682c40 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
PKG = swsw
VERSION = 1.1
-INSTALLINFO ?= install-info
-MAKEINFO ?= makeinfo
+INSTALLINFO = install-info
+MAKEINFO = makeinfo