janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

py-mod.mk, qt-rules.mk, yapp.mk: Add HDRDIR_SCOPE_SUFFIX to ytools include files

Browse source 
Change ytools header location from #include <header.h> to
#include <ytools/header.h>.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-12-18 18:31:37 +00:00
commit 0e5a2ef46e
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
make/py-mod.mk
View file

@ -17,6 +17,9 @@ py.clean:
$(RM) -f *.done *.pyc $(RM) -f *.done *.pyc
/bin/bash $(MOD_SCRIPT_DIR)/scm.sh clean -f __init__.py /bin/bash $(MOD_SCRIPT_DIR)/scm.sh clean -f __init__.py
link-in:
DEVELOPMENT=false INSTALL_SYMLINK=1 make install
install-dirs.done: install-dirs.done:
$(INSTALL) -d -m $(PYMODDIRMODE) -o $(PYMODDIROWNER) -g $(PYMODDIRGROUP) $(PY_INSTALL_DIR) $(INSTALL) -d -m $(PYMODDIRMODE) -o $(PYMODDIROWNER) -g $(PYMODDIRGROUP) $(PY_INSTALL_DIR)
touch $@ touch $@

2
make/qt-rules.mk
View file

@ -20,7 +20,7 @@ endif
ifeq ($(QT_MAJOR_VERSION),4) ifeq ($(QT_MAJOR_VERSION),4)
uic_%.cpp: ui_%.h uic_%.cpp: ui_%.h
echo -e "#include <$<>\n" > $@ echo -e "#include \"$<\"\n" > $@
else else
uic_%.cpp: %.h %.ui uic_%.cpp: %.h %.ui
$(UIC) $*.ui -i $< -o $@ $(UIC) $*.ui -i $< -o $@

2
make/yapp.mk
View file

@ -23,7 +23,7 @@ clean.yapp:
main.cpp: $(YAPP_CLASS_H) main.cpp: $(YAPP_CLASS_H)
echo "#include \"$<\"" > $@.tmp echo "#include \"$<\"" > $@.tmp
if [ "$(YAPP_NAMESPACE)" ]; then echo "using namespace $(YAPP_NAMESPACE);" >> $@.tmp; fi if [ "$(YAPP_NAMESPACE)" ]; then echo "using namespace $(YAPP_NAMESPACE);" >> $@.tmp; fi
echo "#include <YAppRunner.h>" >> $@.tmp echo "#include <ytools/YAppRunner.h>" >> $@.tmp
echo "yapp_main($(YAPP_CLASS))" >> $@.tmp echo "yapp_main($(YAPP_CLASS))" >> $@.tmp
mv $@.tmp $@ mv $@.tmp $@