# New Ticket Created by Joshua Hoblitt
# Please include the string: [perl #37180]
# in the subject line of all future correspondence about this issue.
# <URL: https://rt.perl.org/rt3/Ticket/Display.html?id=37180 >
This patch fixes 'make clean' to recurse into the editor directory and
'make distclean' to remove 'editor/Makefile. It also change the
behavior of 'editor/Makefile' so that the 'all' & 'clean' targets no
longer modify files outside of the parrot tree.
This should resolve bug #36252.
config/gen/makefiles/root.in
add editor/Makefile to GEN_MAKEFILES
add editor-clean target
add editor-clean to clean target
config/gen/makefiles/editor.in
remove vim-install from all target
add imc.kate to all target
rename clean target to vim-uninstall
add 'new' clean target
rename imc.kate target to imcc.xml
add 'new' imc.kate target
editor.in | 14 ++++++++++----
root.in | 15 +++++++++++++--
2 files changed, 23 insertions(+), 6 deletions(-)
-J
--
Index: config/gen/makefiles/root.in
===================================================================
--- config/gen/makefiles/root.in (revision 9199)
+++ config/gen/makefiles/root.in (working copy)
@@ -171,7 +171,8 @@
languages/perl6/Makefile \
languages/urm/Makefile \
languages/tcl/Makefile \
- languages/tcl/examples/Makefile
+ languages/tcl/examples/Makefile \
+ editor/Makefile
GEN_CONFIGS = \
include/parrot/config.h \
@@ -1171,6 +1172,15 @@
###############################################################################
#
+# editors targets:
+#
+###############################################################################
+
+editor-clean :
+ $(MAKE_C) editor clean
+
+###############################################################################
+#
# Testing Targets:
#
###############################################################################
@@ -1317,7 +1327,8 @@
dynclasses-clean \
examples-clean \
imcc-clean \
- compilers-clean
+ compilers-clean \
+ editor-clean
${TEMP_cg_r}
$(RM_F) chartypes *.s *~ $(FLUID_FILES)
Index: config/gen/makefiles/editor.in
===================================================================
--- config/gen/makefiles/editor.in (revision 9199)
+++ config/gen/makefiles/editor.in (working copy)
@@ -11,13 +11,13 @@
default: all
-all: imc.vim vim-install
+all: imc.vim imc.kate
imc.vim: imc.vim.in $(OPS_DIR)/*.ops
$(CP) imc.vim.in imc.vim
$(PERL) ops2vim.pl $(OPS_DIR)/*.ops >> imc.vim
-vim-install:
+vim-install: imc.vim
$(MKDIR) $(VIM_DIR)
$(MKDIR) $(VIM_SYN_DIR)
$(CP) imc.vim $(VIM_SYN_DIR)
@@ -28,15 +28,21 @@
$(MKDIR) $(VIM_IN_DIR)
$(CP) indent_imc.vim $(VIM_IN_DIR)/imc.vim
-imc.kate:
+imc.kate: imcc.xml
+
+imcc.xml:
$(PERL) kate_syntax.pl '..${slash}' > imcc.xml
-clean:
+vim-uninstall:
$(RM_F) $(VIM_SYN_DIR)/imc.vim
$(RM_F) $(VIM_SYN_DIR)/pasm.vim
$(RM_F) $(VIM_SYN_DIR)/pmc.vim
$(RM_F) $(VIM_FT_DIR)/parrot.vim
$(RM_F) $(VIM_IN_DIR)/imc.vim
+clean:
+ $(RM_F) imc.vim
+ $(RM_F) imcc.xml
+
realclean: clean
$(RM_F) Makefile
