[htoolkit-cvs] port makefile,1.45,1.46

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

Update of /cvsroot/htoolkit/port
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5356/port

Modified Files:
	makefile 
Log Message:
This is a major rewrite of menu and toolbar support. The main feature
is that the new API provides action based menu and toolbar. The another
advantage is that now the code is more simpler and shorter. The low lever
API is implemented only under Linux for now.


Index: makefile
===================================================================
RCS file: /cvsroot/htoolkit/port/makefile,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** makefile	24 Nov 2003 22:40:41 -0000	1.45
--- makefile	12 May 2004 20:42:32 -0000	1.46
***************
*** 42,45 ****
--- 42,46 ----
  	  Port/ToolBar.hs \
  	  Port/StatusBar.hs \
+ 	  Port/Action.hs \
  	  Port.hs
  
***************
*** 49,53 ****
  	  FileDialog.c ColorDialog.c FontDialog.c AboutDialog.c PopUp.c Canvas.c Menu.c ListBox.c \
  	  Label.c Font.c RadioBox.c Timer.c Frame.c Message.c Slider.c TrackBar.c ProgressBar.c \
! 	  ConfigKey.c ToolBar.c StatusBar.c Notebook.c GroupBox.c
  
  ifeq "$(GUILIB)" "WIN32"
--- 50,54 ----
  	  FileDialog.c ColorDialog.c FontDialog.c AboutDialog.c PopUp.c Canvas.c Menu.c ListBox.c \
  	  Label.c Font.c RadioBox.c Timer.c Frame.c Message.c Slider.c TrackBar.c ProgressBar.c \
! 	  ConfigKey.c ToolBar.c StatusBar.c Notebook.c GroupBox.c Action.c
  
  ifeq "$(GUILIB)" "WIN32"
***************
*** 117,124 ****
  
  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))
--- 118,125 ----
  
  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))
***************
*** 132,136 ****
  
  # The main targets
! .PHONY: all release 
  
  all: release doc
--- 133,137 ----
  
  # The main targets
! .PHONY: all release
  
  all: release doc
***************
*** 162,166 ****
  # 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
--- 163,167 ----
  # 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
***************
*** 169,175 ****
  	$(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
--- 170,176 ----
  	$(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
***************
*** 181,185 ****
  	$(CC) -o $@ -c $<  $(CC-OPTIONS) -MD $(INCDIRS)
  	@#move dependendcy files only needed for gcc 2.xx
! 	@#@mv $(*F).d $(COUTDIR)/$(*F).c.d 
  
  #--------------------------------------------------------------------------
--- 182,186 ----
  	$(CC) -o $@ -c $<  $(CC-OPTIONS) -MD $(INCDIRS)
  	@#move dependendcy files only needed for gcc 2.xx
! 	@#@mv $(*F).d $(COUTDIR)/$(*F).c.d
  
  #--------------------------------------------------------------------------
***************
*** 194,198 ****
  #--------------------------------------------------------------------------
  # automatically include all dependency information.
! -include $(HDEPS) $(CDEPS) 
  
  # extra dependency rules since GHC doesn't output dependencies
--- 195,199 ----
  #--------------------------------------------------------------------------
  # automatically include all dependency information.
! -include $(HDEPS) $(CDEPS)
  
  # extra dependency rules since GHC doesn't output dependencies