Bug 416377: Have make clean etc. clean up more (in directory/c-sdk). r=mcs

directory/c-sdk/Makefile.in

@@ -56,3 +56,7 @@ depend:
 
 FORCE:
 
+distclean::
+	rm -f $(DIST_GARBAGE)
+	rm -f config/autoconf.mk
+	rm -f `cat unallmakefiles` unallmakefiles

directory/c-sdk/config/config.mk

@@ -104,10 +104,6 @@ endif
 
 GARBAGE		+= $(DEPENDENCIES) core $(wildcard core.[0-9]*)
 
-ifdef USE_AUTOCONF
-DIST_GARBAGE += Makefile
-endif
-
 DEFINES += -DFORCE_PR_LOG
 
 ifeq ($(_PR_NO_CLOCK_TIMER),1)

directory/c-sdk/config/rules.mk

@@ -213,14 +213,10 @@ clobber::
 	rm -rf $(OBJS) $(TARGETS) $(filter-out . ..,$(OBJDIR)) $(GARBAGE) so_locations $(NOSUCHFILE)
 	+$(LOOP_OVER_DIRS)
 
-realclean clobber_all::
+realclean clobber_all distclean::
 	rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH)
 	+$(LOOP_OVER_DIRS)
 
-distclean::
-	rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE)
-	+$(LOOP_OVER_DIRS)
-
 real_install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS)
 ifdef RELEASE_BINS
 	$(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir)

directory/c-sdk/configure

@@ -6883,6 +6883,8 @@ ldap/libraries/libutil/Makefile
 mkdir ldap > /dev/null 2>&1
 mkdir ldap/clients > /dev/null 2>&1
 
+echo $MAKEFILES > unallmakefiles
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure

directory/c-sdk/configure.in

@@ -2645,4 +2645,6 @@ dnl structure for us..
 mkdir ldap > /dev/null 2>&1
 mkdir ldap/clients > /dev/null 2>&1
 
+echo $MAKEFILES > unallmakefiles
+
 AC_OUTPUT([$MAKEFILES])

directory/c-sdk/ldap/libraries/libldif/Makefile.in

@@ -59,7 +59,7 @@ INSTALLDIR      = $(DIST)/$(OBJDIR_NAME)
 
 include $(topsrcdir)/config/rules.mk
 
-GARBAGE 	+= $(LIBLDIF)
+GARBAGE 	+= $(LIBLDIF) $(DLLLDIF)
 
 LOCAL_INCLUDES  = -I$(PUBLIC)/nspr
 INCLUDES	+= -I$(HDIR) -I$(INSTALLDIR)/include -I$(DIST)/include