Skip to content

Commit 0707a72

Browse files
committed
Fix cleanup on cygwin and mingw.
1 parent 70f4e00 commit 0707a72

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

ChangeLog

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2006-07-14 Bruno Haible <bruno@clisp.org>
2+
3+
* src/Makefile.in (clean): Remove also iconv_no_i18n. Needed for
4+
cygwin or mingw.
5+
* tests/Makefile.in (clean): Remove also the programs, without
6+
EXEEXT. Needed for cygwin or mingw.
7+
* Makefile.in (mostlyclean, clean, distclean, maintainer-clean):
8+
Remove also bin directory. Needed for cygwin and mingw.
9+
110
2006-07-03 Bruno Haible <bruno@clisp.org>
211

312
* src/iconv.c (check_subst_formatstring): Use ngettext.

Makefile.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ mostlyclean : force
9797
cd po && $(MAKE) mostlyclean
9898
cd man && $(MAKE) mostlyclean
9999
if test -d tests; then cd tests && $(MAKE) mostlyclean; fi
100+
rm -rf bin
100101

101102
clean : force
102103
cd libcharset && $(MAKE) clean
@@ -107,6 +108,7 @@ clean : force
107108
cd po && $(MAKE) clean
108109
cd man && $(MAKE) clean
109110
if test -d tests; then cd tests && $(MAKE) clean; fi
111+
rm -rf bin
110112

111113
distclean : force
112114
cd libcharset && if test -f Makefile; then $(MAKE) distclean; fi
@@ -120,6 +122,7 @@ distclean : force
120122
$(RM) config.status config.log config.cache Makefile libtool
121123
$(RM) config.h stamp-h1 lib/stamp-h2
122124
$(RM) include/iconv.h include/iconv.h.inst
125+
rm -rf bin
123126

124127
maintainer-clean : force
125128
cd libcharset && if test -f Makefile; then $(MAKE) maintainer-clean; fi
@@ -133,6 +136,7 @@ maintainer-clean : force
133136
$(RM) config.status config.log config.cache Makefile libtool
134137
$(RM) config.h stamp-h1 lib/stamp-h2
135138
$(RM) include/iconv.h include/iconv.h.inst
139+
rm -rf bin
136140

137141
force :
138142

src/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ check : all
113113
mostlyclean : clean
114114

115115
clean : force
116-
$(RM) *.@OBJEXT@ *.lo iconv_no_i18n$(EXEEXT) iconv$(EXEEXT) core
116+
$(RM) *.@OBJEXT@ *.lo iconv_no_i18n iconv_no_i18n$(EXEEXT) iconv$(EXEEXT) core
117117
$(RM) -r .libs _libs
118118

119119
distclean : clean

tests/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ table-to.@OBJEXT@ : $(srcdir)/table-to.c
214214
mostlyclean : clean
215215

216216
clean : force
217-
$(RM) *.@OBJEXT@ *.lo table-from@EXEEXT@ table-to@EXEEXT@ tmp-* genutf8@EXEEXT@ UTF-8.TXT gengb18030z@EXEEXT@ GB18030.TXT core
217+
$(RM) *.@OBJEXT@ *.lo table-from table-from@EXEEXT@ table-to table-to@EXEEXT@ tmp-* genutf8 genutf8@EXEEXT@ UTF-8.TXT gengb18030z gengb18030z@EXEEXT@ GB18030.TXT core
218218
$(RM) -r .libs _libs
219219

220220
distclean : clean

0 commit comments

Comments
 (0)