summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2003-05-15 15:42:41 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2003-05-15 15:42:41 +0000
commit8493fed536aff7d2054e90e253ecf6e478b7a93e (patch)
treee15b8d38978368ddc9985f04e222b68389a38283
parent49208aef2a34dc4ca435812506887b8a45c636af (diff)
downloadATCD-8493fed536aff7d2054e90e253ecf6e478b7a93e.tar.gz
ChangeLogTag: Thu May 15 10:41:32 2003 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog10
-rw-r--r--bin/MakeProjectCreator/templates/gnu.mpd4
-rw-r--r--bin/MakeProjectCreator/templates/make.mpd2
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c5862d73fe..4ad0f443be1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu May 15 10:41:32 2003 Chad Elliott <elliott_c@ociweb.com>
+
+ * bin/MakeProjectCreator/templates/gnu.mpd:
+ * bin/MakeProjectCreator/templates/make.mpd:
+
+ Add a -r to the realclean target for custom generated files. The
+ generated files could be directories.
+
Thu May 15 12:21:28 UTC 2003 Don Hinton <dhinton@dresystems.com>
* ace/SOCK_SEQPACK_Association.cpp:
@@ -11,7 +19,7 @@ Thu May 15 07:08:39 2003 Chad Elliott <elliott_c@ociweb.com>
Fixed a couple of bugs with the custom build types. Generated
files were being selected due to a back regular expression match.
-
+
* bin/MakeProjectCreator/modules/WorkspaceCreator.pm:
Only write out a new workspace if it is different than the
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index 488b6d589dc..bb3cff3f181 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -305,8 +305,10 @@ realclean: clean <%compclean%>
<%if(idl_files)%>
-$(RM) $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext)))
<%endif%>
+<%if(custom_types)%>
ifneq ($(GENERATED_DIRTY),)
- -$(RM) $(GENERATED_DIRTY)
+ -$(RM) -r $(GENERATED_DIRTY)
endif
+<%endif%>
<%marker(bottom)%>
diff --git a/bin/MakeProjectCreator/templates/make.mpd b/bin/MakeProjectCreator/templates/make.mpd
index 1424f26f6bf..d79c96058fb 100644
--- a/bin/MakeProjectCreator/templates/make.mpd
+++ b/bin/MakeProjectCreator/templates/make.mpd
@@ -132,7 +132,7 @@ clean:
realclean: clean
-$(RM) <%if(exename)%>$(BIN)<%else%>$(SHLIB) $(LIB)<%endif%><%if(install)%> <%install%>/$(INSTARGET)<%endif%>
<%if(custom_types)%>
- -$(RM) $(GENERATED_DIRTY)
+ -$(RM) -r $(GENERATED_DIRTY)
<%endif%>
#----------------------------------------------------------------------------