* Makefile.in: increment VERSION.

	(dist:) Rename to srcdist.  Create new dist target to call
	srcdist and bindist targets.
	(srcdist:) New target.
	(clean-top:) add call to mostlyclean-top and add rm of distribution
	tarballs.
	* lib/Makefile.in: (uninstall:) modify to remove files from the
	new w32api subdirectory and to remove w32api subdirectory.
	(xuninstall:) Ditto.
	TODO: Add a task to redo the clean targets of Makefile.in

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 0aa98ba..0270a78 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,16 @@
+2000-11-06  Earnie Boyd  <earnie_boyd@yahoo.com>
+
+       * Makefile.in: increment VERSION.  
+       (dist:) Rename to srcdist.  Create new dist target to call
+       srcdist and bindist targets.
+       (srcdist:) New target.
+       (clean-top:) add call to mostlyclean-top and add rm of distribution
+       tarballs.
+       * lib/Makefile.in: (uninstall:) modify to remove files from the
+       new w32api subdirectory and to remove w32api subdirectory.
+       (xuninstall:) Ditto.
+       TODO: Add a task to redo the clean targets of Makefile.in
+
 Fri Nov  3 21:50:47 2000  Christopher Faylor <cgf@cygnus.com>
 
        * lib/Makefile.in: Install header files in w32api subdirectory.

diff --git a/winsup/w32api/Makefile.in b/winsup/w32api/Makefile.in
index 5c7c787..2e300f0 100644 (file)
--- a/winsup/w32api/Makefile.in
+++ b/winsup/w32api/Makefile.in
@@ -58,7 +58,7 @@ FLAGS_TO_PASS = \
 SUBDIRS = lib
 
 PACKAGE = w32api
-VERSION = 0.3
+VERSION = 0.4
 
 DIST_FILES = Makefile.in configure.in configure config.guess config.sub \
 install-sh README ChangeLog TODO CONTRIBUTIONS
@@ -83,7 +83,9 @@ install uninstall:
 
 distdir = $(PACKAGE)-$(VERSION)
 
-dist:
+dist: srcdist bindist
+
+srcdist:
        rm -rf $(distdir)
        mkdir $(distdir)
        chmod 755 $(distdir)
@@ -109,17 +111,16 @@ Makefile: Makefile.in config.status configure
 
 mostlyclean-top:
        rm -f *~
-clean-top:
+clean-top: mostlyclean-top
        rm -rf $(distdir)
+       rm -f $(distdir)*.tar.gz
 maintainer-clean-top:
 
 mostlyclean: mostlyclean-top mostlyclean-subdirs
 clean: mostlyclean-top clean-subdirs
 distclean: clean-top
        rm -f Makefile config.status config.log config.cache TAGS *~
-       rm -f include/*~
-       rm -f $(distdir)*.tar.gz
        $(MAKE) -C lib distclean
 maintainer-clean: maintainer-clean-subdirs
 
-.PHONY: lib test
+.PHONY: lib test 

diff --git a/winsup/w32api/TODO b/winsup/w32api/TODO
index 7bf33de..7ad7801 100644 (file)
--- a/winsup/w32api/TODO
+++ b/winsup/w32api/TODO
@@ -1,3 +1,5 @@
+Makefile.in: Need to redo the clean targets
+
 **Check to see if the rest of this is still valid?**
 
 winsock2.h - Possible to merge with winsock.h?

diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index 8fdd383..1293b01 100644 (file)
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -150,8 +150,9 @@ xuninstall-libraries:
 
 xuninstall-headers:
        @for i in $(HEADERS); do \
-               rm -f $(tooldir)/include/$$i ; \
+               rm -r $(tooldir)/include/w32api/$$i ; \
        done
+       rmdir $(tooldir)/include/w32api
 
 # install headers and libraries 
 install: install-libraries install-headers
@@ -179,8 +180,9 @@ uninstall-libraries:
 
 uninstall-headers:
        @for i in $(HEADERS); do \
-               rm -f $(exec_prefix)/include/$$i ; \
+               rm -f $(exec_prefix)/include/w32api/$$i ; \
        done
+       rmdir $(exec_prefix)/include/w32api
 
 dist:
        mkdir $(distdir)/include