[Wgui-cvs] wgui/docs Makefile.am,1.4,1.5 Makefile.in,1.8,1.9

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wgui/wgui/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30103/docs

Modified Files:
	Makefile.am Makefile.in 
Log Message:
Makefile fixes.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/wgui/wgui/docs/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.in	20 Apr 2004 18:55:05 -0000	1.8
--- Makefile.in	22 Apr 2004 16:39:45 -0000	1.9
***************
*** 78,82 ****
  STRIP = @STRIP@
  VERSION = @VERSION@
! WGUI_CFLAGS = @WGUI_CFLAGS@
  WGUI_INCLUDES = @WGUI_INCLUDES@
  WGUI_LIBS = @WGUI_LIBS@
--- 78,82 ----
  STRIP = @STRIP@
  VERSION = @VERSION@
! WGUI_CXXFLAGS = @WGUI_CXXFLAGS@
  WGUI_INCLUDES = @WGUI_INCLUDES@
  WGUI_LIBS = @WGUI_LIBS@
***************
*** 90,95 ****
  install_sh = @install_sh@

! libwguidocsdir = ${prefix}/wGui/docs
! libwguidocs_DATA = \
  	Application.html \
  	BullseyeTutorial.html \
--- 90,95 ----
  install_sh = @install_sh@

! libwguidocsdir = ${prefix}/docs
! nobase_libwguidocs_DATA = \
  	Application.html \
  	BullseyeTutorial.html \
***************
*** 102,112 ****
  	Messaging.html \
  	Overview.html \
! 	Resources.html \
! 	tutorial/Bullseye/* \
! 	tutorial/Calc/* \
! 	html/*

! EXTRA_DIST = $(libwguidocs_DATA)
  subdir = docs
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- 102,112 ----
  	Messaging.html \
  	Overview.html \
! 	Resources.html

! #	tutorial/Bullseye/* \
! #	tutorial/Calc/* \
! #	html/*
! EXTRA_DIST = $(nobase_libwguidocs_DATA)
  subdir = docs
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
***************
*** 114,118 ****
  CONFIG_CLEAN_FILES =
  DIST_SOURCES =
! DATA = $(libwguidocs_DATA)

  DIST_COMMON = Makefile.am Makefile.in
--- 114,118 ----
  CONFIG_CLEAN_FILES =
  DIST_SOURCES =
! DATA = $(nobase_libwguidocs_DATA)

  DIST_COMMON = Makefile.am Makefile.in
***************
*** 126,144 ****
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
  uninstall-info-am:
! libwguidocsDATA_INSTALL = $(INSTALL_DATA)
! install-libwguidocsDATA: $(libwguidocs_DATA)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(libwguidocsdir)
! 	@list='$(libwguidocs_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
! 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
! 	  echo " $(libwguidocsDATA_INSTALL) $$d$$p $(DESTDIR)$(libwguidocsdir)/$$f"; \
! 	  $(libwguidocsDATA_INSTALL) $$d$$p $(DESTDIR)$(libwguidocsdir)/$$f; \
  	done

! uninstall-libwguidocsDATA:
  	@$(NORMAL_UNINSTALL)
! 	@list='$(libwguidocs_DATA)'; for p in $$list; do \
! 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
  	  echo " rm -f $(DESTDIR)$(libwguidocsdir)/$$f"; \
  	  rm -f $(DESTDIR)$(libwguidocsdir)/$$f; \
--- 126,144 ----
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
  uninstall-info-am:
! nobase_libwguidocsDATA_INSTALL = $(install_sh_DATA)
! install-nobase_libwguidocsDATA: $(nobase_libwguidocs_DATA)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(libwguidocsdir)
! 	@list='$(nobase_libwguidocs_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
! 	  f="$$p"; \
! 	  echo " $(nobase_libwguidocsDATA_INSTALL) $$d$$p $(DESTDIR)$(libwguidocsdir)/$$f"; \
! 	  $(nobase_libwguidocsDATA_INSTALL) $$d$$p $(DESTDIR)$(libwguidocsdir)/$$f; \
  	done

! uninstall-nobase_libwguidocsDATA:
  	@$(NORMAL_UNINSTALL)
! 	@list='$(nobase_libwguidocs_DATA)'; for p in $$list; do \
! 	  f="$$p"; \
  	  echo " rm -f $(DESTDIR)$(libwguidocsdir)/$$f"; \
  	  rm -f $(DESTDIR)$(libwguidocsdir)/$$f; \
***************
*** 153,157 ****

  distdir: $(DISTFILES)
- 	$(mkinstalldirs) $(distdir)/html $(distdir)/tutorial/Bullseye $(distdir)/tutorial/Calc
  	@list='$(DISTFILES)'; for file in $$list; do \
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--- 153,156 ----
***************
*** 224,228 ****
  info-am:

! install-data-am: install-libwguidocsDATA

  install-exec-am:
--- 223,227 ----
  info-am:

! install-data-am: install-nobase_libwguidocsDATA

  install-exec-am:
***************
*** 242,260 ****
  mostlyclean-am: mostlyclean-generic

! uninstall-am: uninstall-info-am uninstall-libwguidocsDATA

  .PHONY: all all-am check check-am clean clean-generic distclean \
  	distclean-generic distdir dvi dvi-am info info-am install \
  	install-am install-data install-data-am install-exec \
! 	install-exec-am install-info install-info-am \
! 	install-libwguidocsDATA install-man install-strip installcheck \
  	installcheck-am installdirs maintainer-clean \
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	uninstall uninstall-am uninstall-info-am \
! 	uninstall-libwguidocsDATA

  dist-hook:
! 	rm -rf `find $(distdir)/tutorial -name CVS`
  	rm -f $(distdir)/tutorial/Calc/*~
  	rm -f $(distdir)/tutorial/Calc/*.o
--- 241,260 ----
  mostlyclean-am: mostlyclean-generic

! uninstall-am: uninstall-info-am uninstall-nobase_libwguidocsDATA

  .PHONY: all all-am check check-am clean clean-generic distclean \
  	distclean-generic distdir dvi dvi-am info info-am install \
  	install-am install-data install-data-am install-exec \
! 	install-exec-am install-info install-info-am install-man \
! 	install-nobase_libwguidocsDATA install-strip installcheck \
  	installcheck-am installdirs maintainer-clean \
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	uninstall uninstall-am uninstall-info-am \
! 	uninstall-nobase_libwguidocsDATA

  dist-hook:
! 	cp -r html $(distdir)
! 	cp -r tutorial $(distdir)
  	rm -f $(distdir)/tutorial/Calc/*~
  	rm -f $(distdir)/tutorial/Calc/*.o

Index: Makefile.am
===================================================================
RCS file: /cvsroot/wgui/wgui/docs/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	7 Apr 2004 15:14:38 -0000	1.4
--- Makefile.am	22 Apr 2004 16:39:45 -0000	1.5
***************
*** 1,6 ****
  ## Process this file with automake to produce Makefile.in

! libwguidocsdir = ${prefix}/wGui/docs
! libwguidocs_DATA = \
  	Application.html \
  	BullseyeTutorial.html \
--- 1,6 ----
  ## Process this file with automake to produce Makefile.in

! libwguidocsdir = ${prefix}/docs
! nobase_libwguidocs_DATA = \
  	Application.html \
  	BullseyeTutorial.html \
***************
*** 13,25 ****
  	Messaging.html \
  	Overview.html \
! 	Resources.html \
! 	tutorial/Bullseye/* \
! 	tutorial/Calc/* \
! 	html/*

! EXTRA_DIST = $(libwguidocs_DATA)

  dist-hook:
! 	rm -rf `find $(distdir)/tutorial -name CVS`
  	rm -f $(distdir)/tutorial/Calc/*~
  	rm -f $(distdir)/tutorial/Calc/*.o
--- 13,26 ----
  	Messaging.html \
  	Overview.html \
! 	Resources.html
! #	tutorial/Bullseye/* \
! #	tutorial/Calc/* \
! #	html/*

! EXTRA_DIST = $(nobase_libwguidocs_DATA)

  dist-hook:
! 	cp -r html $(distdir)
! 	cp -r tutorial $(distdir)
  	rm -f $(distdir)/tutorial/Calc/*~
  	rm -f $(distdir)/tutorial/Calc/*.o