[htoolkit-cvs] port configure,1.19,1.20 makefile,1.40,1.41

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/htoolkit/port
In directory sc8-pr-cvs1:/tmp/cvs-serv11150

Modified Files:
	configure makefile 
Log Message:
Turn back to old configure/make scripts

Index: configure
===================================================================
RCS file: /cvsroot/htoolkit/port/configure,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** configure	31 Aug 2003 08:09:00 -0000	1.19
--- configure	9 Sep 2003 13:34:39 -0000	1.20
***************
*** 1,1824 ****
! #! /bin/sh
! # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.57 for HToolkit 1.0.
! #
! # Report bugs to <ka2...@ya...>.
! #
! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
! # This configure script is free software; the Free Software Foundation
! # gives unlimited permission to copy, distribute and modify it.
[...3354 lines suppressed...]
! echo "#ifndef _config_h"	 >> src/include/config.h
! echo "# define ${target}_TARGET" >> src/include/config.h
! echo "#endif"			 >> src/include/config.h

+ echo "creating package description"
+ echo " - config/port.pkg"
+ echo "Package"				>  config/port.pkg
+ echo "  { name=\"port\""		>> config/port.pkg
+ echo "  , auto=True"	>> config/port.pkg
+ echo "  , import_dirs=[\"\$libdir/imports\"]"	>> config/port.pkg
+ echo "  , library_dirs=[\"$libdir\" $extralibdirs]"	>> config/port.pkg
+ echo "  , hs_libraries=[\"HSport\"]"	>> config/port.pkg
+ echo "  , extra_libraries=[$extralibs]" >> config/port.pkg
+ echo "  , package_deps=[]"		>> config/port.pkg
+ echo "  , include_dirs = [$incdirs]" >> config/port.pkg
+ echo "  , c_includes = [\"HsPort.h\"]"	>> config/port.pkg
+ echo "  }" >> config/port.pkg

  echo "done -- type 'make' to build the package."
+ echo ""

Index: makefile
===================================================================
RCS file: /cvsroot/htoolkit/port/makefile,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** makefile	3 Sep 2003 17:03:24 -0000	1.40
--- makefile	9 Sep 2003 13:34:39 -0000	1.41
***************
*** 19,23 ****

  # system dependent stuff
! -include config.mk

  #--------------------------------------------------------------------------
--- 19,23 ----

  # system dependent stuff
! -include config/config.mk

  #--------------------------------------------------------------------------
***************
*** 44,48 ****

  STUBS	= Port/Handlers.hs
- GSTSTUBS = GST/Handlers.c

  CSRCS	= Window.c Util.c Bitmap.c Button.c CheckBox.c EditBox.c \
--- 44,47 ----
***************
*** 58,62 ****

  # package description
! PKG	= $(MAIN).pkg

  #--------------------------------------------------------------------------
--- 57,61 ----

  # package description
! PKG	= config/$(MAIN).pkg

  #--------------------------------------------------------------------------
***************
*** 88,92 ****

  HC-OPTIONS	= -O2
! CC-OPTIONS	= -O2 -Wall $(CCOPTIONS)

  ifdef HDOCHTML
--- 87,91 ----

  HC-OPTIONS	= -O2
! CC-OPTIONS	= -O2

  ifdef HDOCHTML
***************
*** 113,131 ****

  # main, object files, dependencies and hi files
! HSLIB	    = $(BUILDDIR)/libHS$(MAIN).a
! GSTLIB	    = $(BUILDDIR)/libGST$(MAIN).so
  MAINOBJ	    = HS$(MAIN).o

  HOBJS	    = $(patsubst %.hs,$(HOUTDIR)/%.o, $(HSRCS))
! HDEPS       = $(patsubst %.hs,$(HOUTDIR)/%.d, $(HSRCS))

! COBJS        = $(patsubst %.c,$(COUTDIR)/%.c.o, $(CSRCS))
! CLOBJS       = $(patsubst %.c,$(COUTDIR)/%.c.lo, $(CSRCS))
! CDEPS        = $(patsubst %.c,$(COUTDIR)/%.c.d, $(CSRCS))

  STUBOBJS    = $(patsubst %.hs,$(HOUTDIR)/%.o, $(STUBS))
  STUBINCS    = $(patsubst %.hs,$(HOUTDIR)/%_stub.h, $(STUBS))
  STUBSTUBOBJS= $(patsubst %.hs,$(HOUTDIR)/%_stub.o, $(STUBS))
! GSTSTUBOBJS = $(patsubst %.c,$(COUTDIR)/%_stub.o, $(GSTSTUBS))

  #--------------------------------------------------------------------------
--- 112,128 ----

  # main, object files, dependencies and hi files
! MAINLIB	    = $(BUILDDIR)/libHS$(MAIN).a
  MAINOBJ	    = HS$(MAIN).o

  HOBJS	    = $(patsubst %.hs,$(HOUTDIR)/%.o, $(HSRCS))
! HDEPS       = $(patsubst %.hs,$(HOUTDIR)/%.d, $(HSRCS))  

! COBJS	    = $(patsubst %.c,$(COUTDIR)/%.c.o, $(CSRCS))    	      
! CDEPS       = $(patsubst %.c,$(COUTDIR)/%.c.d, $(CSRCS))    

  STUBOBJS    = $(patsubst %.hs,$(HOUTDIR)/%.o, $(STUBS))
  STUBINCS    = $(patsubst %.hs,$(HOUTDIR)/%_stub.h, $(STUBS))
  STUBSTUBOBJS= $(patsubst %.hs,$(HOUTDIR)/%_stub.o, $(STUBS))
! 

  #--------------------------------------------------------------------------
***************
*** 134,152 ****

  # The main targets
! .PHONY: all release

  all: release doc

! TARGETLIBS=
! ifeq "$(GHCDISABLED)" "NO"
! 	TARGETLIBS += $(HSLIB)
! endif
! ifeq "$(GSTDISABLED)" "NO"
! 	TARGETLIBS += $(GSTLIB)
! endif
! 
! release:  $(TARGETLIBS)

! install: $(HSLIB) $(PKG)
  	install -d $(LIBDIR)/imports/Graphics/UI/Port
  	install -d $(LIBDIR)/include/port
--- 131,141 ----

  # The main targets
! .PHONY: all release 

  all: release doc

! release:  $(MAINLIB)

! install: $(MAINLIB) $(PKG)
  	install -d $(LIBDIR)/imports/Graphics/UI/Port
  	install -d $(LIBDIR)/include/port
***************
*** 155,159 ****
  	install -m 644 $(HOUTDIR)/*.hi $(LIBDIR)/imports/Graphics/UI
  	install -m 644 $(HOUTDIR)/Port/*.hi $(LIBDIR)/imports/Graphics/UI/Port
! 	install -m 644 $(HSLIB) $(LIBDIR)
  	install -m 644 src/include/HsPort.h $(LIBDIR)/include
  	install -m 644 src/include/*.h $(LIBDIR)/include/port
--- 144,148 ----
  	install -m 644 $(HOUTDIR)/*.hi $(LIBDIR)/imports/Graphics/UI
  	install -m 644 $(HOUTDIR)/Port/*.hi $(LIBDIR)/imports/Graphics/UI/Port
! 	install -m 644 $(MAINLIB) $(LIBDIR)
  	install -m 644 src/include/HsPort.h $(LIBDIR)/include
  	install -m 644 src/include/*.h $(LIBDIR)/include/port
***************
*** 163,172 ****
  	install -m 644 doc/*.html doc/*.css doc/*.gif doc/*.haddock $(LIBDIR)/doc/html/port

! $(HSLIB): $(HOBJS) $(COBJS) $(STUBSTUBOBJS)
! 	$(RM) $(HSLIB)
! 	$(AR) -r  $@ $^

- $(GSTLIB) : $(CLOBJS) $(GSTSTUBOBJS)
- 	$(LD) $^ -o $@ $(CLIBS)

  # create an object file from source files. Note that we also generate
--- 152,159 ----
  	install -m 644 doc/*.html doc/*.css doc/*.gif doc/*.haddock $(LIBDIR)/doc/html/port

! $(MAINLIB): $(HOBJS) $(COBJS) $(STUBSTUBOBJS)
! 	  $(RM) $(MAINLIB)
! 	  $(AR) -r  $@ $^

  # create an object file from source files. Note that we also generate
***************
*** 174,178 ****
  # by sed to prepend the proper directory to the target and to move it
  # into the proper directory (debug or release). The way dependency files
! # are handled was 'discovered' by Tom Tromey, and described by Paul Smith,
  # see: "http://www.paulandlesley.org/gmake/autodep.html"
  .SUFFIXES: .hs .hi .o .c
--- 161,165 ----
  # by sed to prepend the proper directory to the target and to move it
  # into the proper directory (debug or release). The way dependency files
! # are handled was 'discovered' by Tom Tromey, and described by Paul Smith, 
  # see: "http://www.paulandlesley.org/gmake/autodep.html"
  .SUFFIXES: .hs .hi .o .c
***************
*** 181,187 ****
  	$(HC) -o $@ -package-name port -ohi $(BUILDDIR)/Graphics/UI/$(*D)/$(*F).hi -odir $(HOUTDIR)/$(*D) -c $<  $(HC-OPTIONS) $($(*F)_OPTIONS) -i$(BUILDDIR) $(INCDIRS)
  	@# move stub files
! 	@-if test -f $(<D)/$(*F)_stub.h; then $(MV) $(<D)/$(*F)_stub.[ch] $(HOUTDIR)/$(*D); fi
  	@# 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
--- 168,174 ----
  	$(HC) -o $@ -package-name port -ohi $(BUILDDIR)/Graphics/UI/$(*D)/$(*F).hi -odir $(HOUTDIR)/$(*D) -c $<  $(HC-OPTIONS) $($(*F)_OPTIONS) -i$(BUILDDIR) $(INCDIRS)
  	@# move stub files
! 	@-if test -f $(<D)/$(*F)_stub.h; then $(MV) $(<D)/$(*F)_stub.[ch] $(HOUTDIR)/$(*D); fi   
  	@# 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
***************
*** 192,200 ****
  $(COBJS): $(COUTDIR)/%.c.o: %.c
  	$(CC) -o $@ -c $<  $(CC-OPTIONS) -MD $(INCDIRS)
! 	@#move dependendcy files only needed for gcc 2.xx
! 	@#@mv $(*F).d $(COUTDIR)/$(*F).c.d
! 
! $(GSTSTUBOBJS) : $(COUTDIR)/%.o: %.c
! 	$(CC) -o $@ -c $<  $(CC-OPTIONS) -MD $(INCDIRS)

  #--------------------------------------------------------------------------
--- 179,184 ----
  $(COBJS): $(COUTDIR)/%.c.o: %.c
  	$(CC) -o $@ -c $<  $(CC-OPTIONS) -MD $(INCDIRS)
! 	@#move dependendcy files only needed for gcc 2.xx
! 	@#@mv $(*F).d $(COUTDIR)/$(*F).c.d 

  #--------------------------------------------------------------------------
***************
*** 236,240 ****
  # extra commands: clean up all directories and show linecounts.
  clean:
! 	$(RM) $(HSLIB)
  	$(RM) $(DOCDIR)/*.html $(DOCDIR)/*.gif $(DOCDIR)/*.css $(DOCDIR)/*.haddock
  	$(RM) $(HOUTDIR)/*.*
--- 220,224 ----
  # extra commands: clean up all directories and show linecounts.
  clean:
! 	$(RM) $(MAINLIB)
  	$(RM) $(DOCDIR)/*.html $(DOCDIR)/*.gif $(DOCDIR)/*.css $(DOCDIR)/*.haddock
  	$(RM) $(HOUTDIR)/*.*