mirror of
https://github.com/ascii-boxes/boxes.git
synced 2025-06-22 02:31:24 +02:00
Move generated boxes.h to 'out/'
Also rename boxes.h.in to boxes.in.h to make file type detection easier
This commit is contained in:
parent
614ea31237
commit
425d354bc0
1
.vscode/settings.json
vendored
1
.vscode/settings.json
vendored
@ -15,7 +15,6 @@
|
|||||||
"editor.rulers": [120],
|
"editor.rulers": [120],
|
||||||
"editor.wordWrapColumn": 120,
|
"editor.wordWrapColumn": 120,
|
||||||
"files.associations": {
|
"files.associations": {
|
||||||
"*.h.in": "c",
|
|
||||||
"*.1.in": "troff"
|
"*.1.in": "troff"
|
||||||
},
|
},
|
||||||
"files.encoding": "utf8",
|
"files.encoding": "utf8",
|
||||||
|
17
Makefile
17
Makefile
@ -58,10 +58,13 @@ infomsg:
|
|||||||
@echo "| For compilation info please refer to the boxes compilation FAQ"
|
@echo "| For compilation info please refer to the boxes compilation FAQ"
|
||||||
@echo "| at https://boxes.thomasjensen.com/docs/faq.html#q5"
|
@echo "| at https://boxes.thomasjensen.com/docs/faq.html#q5"
|
||||||
|
|
||||||
replaceinfos: src/boxes.h doc/boxes.1
|
$(OUT_DIR):
|
||||||
|
mkdir $(OUT_DIR)
|
||||||
|
|
||||||
src/boxes.h: src/boxes.h.in Makefile
|
replaceinfos: $(OUT_DIR)/boxes.h doc/boxes.1
|
||||||
sed -e 's/--BVERSION--/$(BVERSION) $(GIT_STATUS)/; s/--GLOBALCONF--/$(subst /,\/,$(GLOBALCONF))/' src/boxes.h.in > src/boxes.h
|
|
||||||
|
$(OUT_DIR)/boxes.h: src/boxes.in.h Makefile | $(OUT_DIR)
|
||||||
|
sed -e 's/--BVERSION--/$(BVERSION) $(GIT_STATUS)/; s/--GLOBALCONF--/$(subst /,\/,$(GLOBALCONF))/' src/boxes.in.h > $(OUT_DIR)/boxes.h
|
||||||
|
|
||||||
doc/boxes.1: doc/boxes.1.in Makefile
|
doc/boxes.1: doc/boxes.1.in Makefile
|
||||||
sed -e 's/--BVERSION--/$(BVERSION)/; s/--GLOBALCONF--/$(subst /,\/,$(GLOBALCONF))/' doc/boxes.1.in > doc/boxes.1
|
sed -e 's/--BVERSION--/$(BVERSION)/; s/--GLOBALCONF--/$(subst /,\/,$(GLOBALCONF))/' doc/boxes.1.in > doc/boxes.1
|
||||||
@ -111,15 +114,15 @@ tools/LICENSE.txt: LICENSE
|
|||||||
tools/boxes.cfg: boxes-config
|
tools/boxes.cfg: boxes-config
|
||||||
unix2dos -n boxes-config tools/boxes.cfg
|
unix2dos -n boxes-config tools/boxes.cfg
|
||||||
|
|
||||||
tools/boxes.exe: out/boxes.exe
|
tools/boxes.exe: $(OUT_DIR)/boxes.exe
|
||||||
cp out/boxes.exe tools/
|
cp $(OUT_DIR)/boxes.exe tools/
|
||||||
|
|
||||||
out/boxes.exe: win32
|
$(OUT_DIR)/boxes.exe: win32
|
||||||
|
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f src/boxes.h tools/boxes.cfg tools/LICENSE.txt tools/boxes.exe tools/README*.md boxes.portable.*.nupkg
|
rm -f $(OUT_DIR)/boxes.h tools/boxes.cfg tools/LICENSE.txt tools/boxes.exe tools/README*.md boxes.portable.*.nupkg
|
||||||
rm -f doc/boxes.1 doc/boxes.1.raw.html doc/boxes.1.html
|
rm -f doc/boxes.1 doc/boxes.1.raw.html doc/boxes.1.html
|
||||||
$(MAKE) -C src clean
|
$(MAKE) -C src clean
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ VPATH = $(SRC_DIR):$(SRC_DIR)/misc
|
|||||||
GEN_HDR = parser.h boxes.h
|
GEN_HDR = parser.h boxes.h
|
||||||
GEN_SRC = parser.c lex.yy.c
|
GEN_SRC = parser.c lex.yy.c
|
||||||
GEN_FILES = $(GEN_SRC) $(GEN_HDR)
|
GEN_FILES = $(GEN_SRC) $(GEN_HDR)
|
||||||
ORIG_HDRCL = boxes.h.in config.h
|
ORIG_HDRCL = boxes.in.h config.h
|
||||||
ORIG_HDR = $(ORIG_HDRCL) discovery.h generate.h lexer.h regulex.h remove.h shape.h tools.h unicode.h
|
ORIG_HDR = $(ORIG_HDRCL) discovery.h generate.h lexer.h regulex.h remove.h shape.h tools.h unicode.h
|
||||||
ORIG_GEN = lexer.l parser.y
|
ORIG_GEN = lexer.l parser.y
|
||||||
ORIG_NORM = boxes.c discovery.c generate.c regulex.c remove.c shape.c tools.c unicode.c
|
ORIG_NORM = boxes.c discovery.c generate.c regulex.c remove.c shape.c tools.c unicode.c
|
||||||
|
@ -30,6 +30,7 @@
|
|||||||
/* #define PARSER_DEBUG 1 */
|
/* #define PARSER_DEBUG 1 */
|
||||||
/* #define LEXER_DEBUG 1 */
|
/* #define LEXER_DEBUG 1 */
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
#include <unitypes.h>
|
#include <unitypes.h>
|
||||||
#include "regulex.h"
|
#include "regulex.h"
|
||||||
#include "shape.h"
|
#include "shape.h"
|
||||||
@ -181,4 +182,4 @@ extern input_t input;
|
|||||||
|
|
||||||
#endif /* BOXES_H */
|
#endif /* BOXES_H */
|
||||||
|
|
||||||
/*EOF*/ /* vim: set cindent sw=4 syntax=c: */
|
/*EOF*/ /* vim: set cindent sw=4: */
|
Loading…
x
Reference in New Issue
Block a user