[htoolkit-cvs] gio configure,1.3,1.4 makefile,1.10,1.11

[<kr_...@us...>]

Update of /cvsroot/htoolkit/gio
In directory sc8-pr-cvs1:/tmp/cvs-serv2028

Modified Files:
	configure makefile 
Log Message:
better configure/make stripts


Index: configure
===================================================================
RCS file: /cvsroot/htoolkit/gio/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure	8 Jun 2003 19:42:12 -0000	1.3
--- configure	16 Jul 2003 22:27:09 -0000	1.4
***************
*** 6,10 ****
  #  Daan Leijen.
  #
! #  Copyright 2001, Daan Leijen. 
  #------------------------------------------------------------------------
  
--- 6,10 ----
  #  Daan Leijen.
  #
! #  Copyright 2001, Daan Leijen.
  #------------------------------------------------------------------------
  
***************
*** 20,23 ****
--- 20,24 ----
  hdochtml=""
  portdir=""
+ libdir=""
  
  # Parse command-line arguments
***************
*** 106,109 ****
--- 107,111 ----
  esac
  
+ libdir="`$hc --print-libdir`"
  
  # Do we have ghc-pkg?
***************
*** 214,219 ****
  echo " - config"
  mkdir -p config
! echo " - imports/Graphics/UI/GIO"
! mkdir -p imports imports/Graphics imports/Graphics/UI imports/Graphics/UI/GIO 
  
  # Finish generated files
--- 216,221 ----
  echo " - config"
  mkdir -p config
! echo " - build/Graphics/UI/GIO"
! mkdir -p build build/Graphics build/Graphics/UI build/Graphics/UI/GIO
  
  # Finish generated files
***************
*** 242,245 ****
--- 244,250 ----
   echo "PORTDIR=$portdir"  >> config/config.mk
  fi
+ if test ! -z "$libdir"; then
+  echo "LIBDIR=$libdir"  >> config/config.mk
+ fi
  echo ""			 >> config/config.mk
  echo "TOPDIR=$curdir"    >> config/config.mk
***************
*** 258,264 ****
  echo "  { name=\"gio\""				>> config/gio.pkg
  echo "  , auto=True"				>> config/gio.pkg
! echo "  , import_dirs=[\"$curdir/imports\"]"	>> config/gio.pkg
! echo "  , library_dirs=[\"$curdir/imports\"]"	>> config/gio.pkg
! echo "  , hs_libraries=[\"gio\"]"		>> config/gio.pkg
  echo "  , package_deps=[\"port\"]"		>> config/gio.pkg
  echo "  }"					>> config/gio.pkg
--- 263,269 ----
  echo "  { name=\"gio\""				>> config/gio.pkg
  echo "  , auto=True"				>> config/gio.pkg
! echo "  , import_dirs=[\"\$libdir/imports\"]"	>> config/gio.pkg
! echo "  , library_dirs=[\"$libdir\"]"	>> config/gio.pkg
! echo "  , hs_libraries=[\"HSgio\"]"		>> config/gio.pkg
  echo "  , package_deps=[\"port\"]"		>> config/gio.pkg
  echo "  }"					>> config/gio.pkg

Index: makefile
===================================================================
RCS file: /cvsroot/htoolkit/gio/makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** makefile	8 Jul 2003 20:36:26 -0000	1.10
--- makefile	16 Jul 2003 22:27:09 -0000	1.11
***************
*** 39,43 ****
  	   GIO/ToolBar.hs \
  	   GIO.hs \
! 	   
  
  HPATH	= Graphics/UI
--- 39,43 ----
  	   GIO/ToolBar.hs \
  	   GIO.hs \
! 
  
  HPATH	= Graphics/UI
***************
*** 48,56 ****
  PKG	    = config/$(MAIN).pkg
  
! IMPORTSDIR  = imports
  DOCDIR	    = doc
  SRCDIR	    = src
  
! HOUTDIR	    = $(IMPORTSDIR)/$(HPATH)
  HSRCDIR	    = $(SRCDIR)/$(HPATH)
  
--- 48,56 ----
  PKG	    = config/$(MAIN).pkg
  
! BUILDDIR     = build
  DOCDIR	    = doc
  SRCDIR	    = src
  
! HOUTDIR	    = $(BUILDDIR)/$(HPATH)
  HSRCDIR	    = $(SRCDIR)/$(HPATH)
  
***************
*** 65,69 ****
  
  # options
! HC-OPTIONS	= -package port # -O2
  
  # haddock
--- 65,69 ----
  
  # options
! HC-OPTIONS	= -package port -O2
  
  # haddock
***************
*** 94,107 ****
  
  # the source directories
! SRCDIRS	= $(HSRCDIRS) 
  VPATH   = $(SRCDIRS)
  
  # main, object files, dependencies and hi files
! MAINLIB	    = $(IMPORTSDIR)/lib$(MAIN).a
! MAINOBJ	    = $(IMPORTSDIR)/$(MAIN).o
  
! HOBJS	    = $(patsubst %.hs,$(HOUTDIR)/%.o, $(HSOURCES))  
! HDEPS       = $(patsubst %.hs,$(HOUTDIR)/%.d, $(HSOURCES))  
! HHIS	    = $(patsubst %.hs,$(HOUTDIR)/%.hi, $(HSOURCES))  
  
  
--- 94,107 ----
  
  # the source directories
! SRCDIRS	= $(HSRCDIRS)
  VPATH   = $(SRCDIRS)
  
  # main, object files, dependencies and hi files
! MAINLIB	    = $(BUILDDIR)/libHS$(MAIN).a
! MAINOBJ	    = $(BUILDDIR)/HS$(MAIN).o
  
! HOBJS	    = $(patsubst %.hs,$(HOUTDIR)/%.o, $(HSOURCES))
! HDEPS       = $(patsubst %.hs,$(HOUTDIR)/%.d, $(HSOURCES))
! HHIS	    = $(patsubst %.hs,$(HOUTDIR)/%.hi, $(HSOURCES))
  
  
***************
*** 111,125 ****
  
  # The main targets
! .PHONY: all release 
  
  all: release doc
  
  # release and debug versions
! release:  $(MAINOBJ)
  
  # build a library
! $(MAINOBJ): $(MAINLIB) $(PKG)
! 	  $(RM) $(MAINOBJ)
! 	  $(HCPKG) -u -g -i $(PKG)
  
  $(MAINLIB): $(HOBJS) $(COBJS) $(STUBSTUBOBJS)
--- 111,129 ----
  
  # The main targets
! .PHONY: all release
  
  all: release doc
  
  # release and debug versions
! release:  $(MAINLIB)
  
  # build a library
! install: $(MAINLIB) $(PKG)
! 	install -d $(LIBDIR)/imports/Graphics/UI/GIO
! 	install -m 644 build/Graphics/UI/*.hi $(LIBDIR)/imports/Graphics/UI
! 	install -m 644 build/Graphics/UI/GIO/*.hi $(LIBDIR)/imports/Graphics/UI/GIO
! 	install -m 644 $(MAINLIB) $(LIBDIR)
! 	$(RM) $(LIBDIR)/$(MAINOBJ)
! 	$(HCPKG) -u -g -i $(PKG)
  
  $(MAINLIB): $(HOBJS) $(COBJS) $(STUBSTUBOBJS)
***************
*** 136,142 ****
  
  $(HOBJS): $(HOUTDIR)/%.o: %.hs
! 	$(HC) -o $@ -package-name gio -ohi $(subst .o,.hi,$@) -odir $(HOUTDIR)/$(*D) -c $<  $(HC-OPTIONS) -i$(IMPORTSDIR) $(INCDIRS) 
  	@# create dependency file
! 	@$(HC) $< $(HC-OPTIONS) -M -optdep-f -optdep$(*F).d -i$(IMPORTSDIR)               
  	@sed -e 's|$(subst .hs,,$<)\.o|$(HOUTDIR)/$*\.o|' $(*F).d > $(HOUTDIR)/$*.d
  	@rm $(*F).d
--- 140,146 ----
  
  $(HOBJS): $(HOUTDIR)/%.o: %.hs
! 	$(HC) -o $@ -package-name gio -ohi $(subst .o,.hi,$@) -odir $(HOUTDIR)/$(*D) -c $<  $(HC-OPTIONS) -i$(BUILDDIR) $(INCDIRS)
  	@# create dependency file
! 	@$(HC) $< $(HC-OPTIONS) -M -optdep-f -optdep$(*F).d -i$(BUILDDIR)
  	@sed -e 's|$(subst .hs,,$<)\.o|$(HOUTDIR)/$*\.o|' $(*F).d > $(HOUTDIR)/$*.d
  	@rm $(*F).d
***************
*** 158,163 ****
  cleanHS:
  	@# clean up HOUTDIR
! 	$(RM) $(HOUTDIR)/*.*
! 	$(RM) $(HOUTDIR)/GIO/*.*
  
  cleanLIB:
--- 162,168 ----
  cleanHS:
  	@# clean up HOUTDIR
! 	$(RM) $(BUILDDIR)/*
! 	$(RM) $(BUILDDIR)/Graphics/UI/*
! 	$(RM) $(BUILDDIR)/Graphics/UI/GIO/*
  
  cleanLIB: