diff options
| author | Mohan Embar <gnustuff@thisiscool.com> | 2003-09-17 02:44:43 +0000 |
|---|---|---|
| committer | Mohan Embar <membar@gcc.gnu.org> | 2003-09-17 02:44:43 +0000 |
| commit | 2db99d0587ee5a9e09cce0d5af97e4dcf0ceb766 (patch) | |
| tree | 85f0127cb9c984116c660b10f78b5b313968a123 /libjava | |
| parent | e2ffd79638a99be102aacb3d825c5a9d8a0ea913 (diff) | |
| download | gcc-2db99d0587ee5a9e09cce0d5af97e4dcf0ceb766.zip gcc-2db99d0587ee5a9e09cce0d5af97e4dcf0ceb766.tar.gz gcc-2db99d0587ee5a9e09cce0d5af97e4dcf0ceb766.tar.bz2 | |
Makefile.am: (MOSTLYCLEANFILES) Removed libtool objects.
* Makefile.am: (MOSTLYCLEANFILES) Removed libtool objects.
(mostlyclean-local): New target patterned after clean-local
which recursively deletes all libtool objects using 'libtool rm'.
(clean-local): Slightly modified comment to alleviate monotony.
(distclean-local): New target patterned after clean-local
which recursively deletes all .d files.
* Makefile.in: Rebuilt.
From-SVN: r71451
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 10 | ||||
| -rw-r--r-- | libjava/Makefile.am | 15 | ||||
| -rw-r--r-- | libjava/Makefile.in | 17 |
3 files changed, 37 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 6dbfa3c..cb94164 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,13 @@ +2003-09-16 Mohan Embar <gnustuff@thisiscool.com> + + * Makefile.am: (MOSTLYCLEANFILES) Removed libtool objects. + (mostlyclean-local): New target patterned after clean-local + which recursively deletes all libtool objects using 'libtool rm'. + (clean-local): Slightly modified comment to alleviate monotony. + (distclean-local): New target patterned after clean-local + which recursively deletes all .d files. + * Makefile.in: Rebuilt. + 2003-09-11 Tom Tromey <tromey@redhat.com> * java/net/URLStreamHandler.java (parseURL): If original file diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 5658ee3..59a3773 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -356,13 +356,24 @@ libgcj-@gcc_version@.jar: $(all_java_source_files) # is built. $(all_java_class_files): libgcj-@gcc_version@.jar -MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers) +# Note: The libtool objects are removed by mostlyclean-local +# because of command-line-length issues. +MOSTLYCLEANFILES = $(nat_headers) $(x_nat_headers) + CLEANFILES = libgcj-@gcc_version@.jar +mostlyclean-local: +## Use libtool rm to remove each libtool object + find . -name '*.lo' -print | xargs $(LIBTOOL) rm -f + clean-local: -## We just remove every .class file that was created. +## Remove every .class file that was created. find . -name '*.class' -print | xargs rm -f +distclean-local: +## Remove every .d file that was created. + find . -name '*.d' -print | xargs rm -f + # Just remove the objects from C++ sources, for testing the C++ compiler. clean-nat: rm -f $(nat_files) $(x_nat_files) diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 60e9358..6715254 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -429,7 +429,10 @@ all_java_source_files = \ all_java_class_files = $(all_java_source_files:.java=.class) -MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers) +# Note: The libtool objects are removed by mostlyclean-local +# because of command-line-length issues. +MOSTLYCLEANFILES = $(nat_headers) $(x_nat_headers) + CLEANFILES = libgcj-@gcc_version@.jar SUFFIXES = .class .java .h @@ -4802,7 +4805,8 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-toolexeclibLTLIBRARIES mostlyclean-compile \ mostlyclean-libtool mostlyclean-binPROGRAMS \ mostlyclean-noinstPROGRAMS mostlyclean-tags \ - mostlyclean-depend mostlyclean-generic + mostlyclean-depend mostlyclean-generic \ + mostlyclean-local mostlyclean: mostlyclean-recursive @@ -4815,7 +4819,8 @@ clean: clean-recursive distclean-am: distclean-toolexeclibLTLIBRARIES distclean-compile \ distclean-libtool distclean-binPROGRAMS \ distclean-noinstPROGRAMS distclean-tags \ - distclean-depend distclean-generic clean-am + distclean-depend distclean-generic clean-am \ + distclean-local -rm -f libtool distclean: distclean-recursive @@ -4883,9 +4888,15 @@ libgcj-@gcc_version@.jar: $(all_java_source_files) # is built. $(all_java_class_files): libgcj-@gcc_version@.jar +mostlyclean-local: + find . -name '*.lo' -print | xargs $(LIBTOOL) rm -f + clean-local: find . -name '*.class' -print | xargs rm -f +distclean-local: + find . -name '*.d' -print | xargs rm -f + # Just remove the objects from C++ sources, for testing the C++ compiler. clean-nat: rm -f $(nat_files) $(x_nat_files) |