diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2007-06-08 15:26:23 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2007-06-08 15:26:23 +0800 |
| commit | 2b0fd11d10177b71f1465afac79ffe8ac1abcced (patch) | |
| tree | af5c67428aabd0471f087b3abe11d0c85183cd18 /cpp/src | |
| parent | add .gitignore files. (diff) | |
| download | ice-2b0fd11d10177b71f1465afac79ffe8ac1abcced.tar.bz2 ice-2b0fd11d10177b71f1465afac79ffe8ac1abcced.tar.xz ice-2b0fd11d10177b71f1465afac79ffe8ac1abcced.zip | |
clean up clean rules.
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/Makefile | 3 | ||||
| -rw-r--r-- | cpp/src/FreezeScript/Makefile | 4 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile | 4 | ||||
| -rw-r--r-- | cpp/src/Slice/Makefile | 4 | ||||
| -rw-r--r-- | cpp/src/icecpp/Makefile | 2 |
6 files changed, 8 insertions, 11 deletions
diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile index 5034fd1d397..f4257c2040e 100644 --- a/cpp/src/Freeze/Makefile +++ b/cpp/src/Freeze/Makefile @@ -76,8 +76,7 @@ $(HDIR)/Catalog.h Catalog.cpp: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice mv Catalog.h $(HDIR)/Catalog.h clean:: - rm -f $(HDIR)/Catalog.h Catalog.cpp - + -rm -f $(HDIR)/Catalog.h Catalog.cpp $(libdir)/$(LIBFILENAME): $(OBJS) rm -f $@ diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile index 7416d736e18..d6d1a723704 100644 --- a/cpp/src/FreezeScript/Makefile +++ b/cpp/src/FreezeScript/Makefile @@ -51,8 +51,8 @@ $(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS) $(CXX) $(LDFLAGS) -o $@ $(DUMP_OBJS) $(COMMON_OBJS) -lSlice $(EXPAT_RPATH_LINK) -lIceXML $(DB_RPATH_LINK) -lFreeze $(LIBS) $(DB_LIBS) clean:: - rm -f Grammar.cpp Grammar.h - rm -f Scanner.cpp + -rm -f Grammar.cpp Grammar.h + -rm -f Scanner.cpp install:: all $(call installprogram,$(TRANSFORMDB),$(install_bindir)) diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile index 8a0bf9dc85a..c474115b075 100644 --- a/cpp/src/IceGrid/Makefile +++ b/cpp/src/IceGrid/Makefile @@ -167,7 +167,7 @@ $(LOCAL_HDIR)/StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SLICE StringApplicationInfoDict $(LOCAL_SDIR)/Internal.ice clean:: - rm -f StringApplicationInfoDict.h StringApplicationInfoDict.cpp + -rm -f StringApplicationInfoDict.h StringApplicationInfoDict.cpp $(LOCAL_HDIR)/IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(SLICE2FREEZE) rm -f IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index d9b54c01f6d..e227f8f47af 100644 --- a/cpp/src/IceStorm/Makefile +++ b/cpp/src/IceStorm/Makefile @@ -99,13 +99,11 @@ PersistentTopicMap.h PersistentTopicMap.cpp: ../IceStorm/LinkRecord.ice $(sliced $(SLICE2FREEZECMD) --dict IceStorm::PersistentTopicMap,Ice::Identity,IceStorm::LinkRecordSeq \ PersistentTopicMap ../IceStorm/LinkRecord.ice -clean:: - rm -f PersistentTopicMap.h PersistentTopicMap.cpp - # Needed for make -jn to work. ../IceStorm/Grammar.y: Grammar.h clean:: + -rm -f PersistentTopicMap.h PersistentTopicMap.cpp -rm -f Grammar.cpp Grammar.h -rm -f Scanner.cpp diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile index c2d0d653559..c3e4fa7e867 100644 --- a/cpp/src/Slice/Makefile +++ b/cpp/src/Slice/Makefile @@ -60,8 +60,8 @@ endif .NOTPARALLEL: clean:: - rm -f Grammar.cpp Grammar.h - rm -f Scanner.cpp + -rm -f Grammar.cpp Grammar.h + -rm -f Scanner.cpp install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/icecpp/Makefile b/cpp/src/icecpp/Makefile index 0cb1f045adb..d7a54655318 100644 --- a/cpp/src/icecpp/Makefile +++ b/cpp/src/icecpp/Makefile @@ -32,4 +32,4 @@ install:: all $(call installprogram,$(NAME),$(install_bindir)) clean:: - rm -f cexp.c + -rm -f cexp.c |