[Cbar-develop] cbar/misc makefile.all,1.8,1.9 zipup.sh,1.6,1.7

[Christer S. <ch...@us...>]

Update of /cvsroot/cbar/cbar/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22158/misc

Modified Files:
	makefile.all zipup.sh 
Log Message:
some more build issues

Index: makefile.all
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.all,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** makefile.all	8 Nov 2004 21:20:45 -0000	1.8
--- makefile.all	18 Sep 2005 19:50:27 -0000	1.9
***************
*** 18,23 ****
  #        docs:         Build only the documentation.
  #        clean:        Remove rebuildable files.
- #        uninstall:    Uninstalls the header files of CBAR and all brands of the lib that has been installed.
  #        compress:     Compress the example executable using upx.
  #        help:         Display this help.
  #
--- 18,23 ----
  #        docs:         Build only the documentation.
  #        clean:        Remove rebuildable files.
  #        compress:     Compress the example executable using upx.
+ #        uninstall:    Uninstalls the header files of CBAR and all brands of the lib that has been installed.
  #        help:         Display this help.
  #
***************
*** 43,47 ****
  include misc/makefile.ver
  
! GEN_C_FILES = labldata.c
  
  GEN_H_FILES = $(addsuffix .h,$(basename $(GEN_C_FILES)))
--- 43,48 ----
  include misc/makefile.ver
  
! GEN_C_FILES = \
!   labldata.c
  
  GEN_H_FILES = $(addsuffix .h,$(basename $(GEN_C_FILES)))
***************
*** 55,58 ****
--- 56,60 ----
    unit.c
  
+ 
  EXAMPLES_SOURCE = 1_bar.c
  
***************
*** 89,97 ****
  include misc/$(MAKEFILE_INC)
  
  # -------- Set variables --------
  
  DOCS = \
   docs/cbar.txt docs/cbar$(HTML_SUFFIX) docs/cbar$(INFO_SUFFIX) docs/cbar.rtf \
!  docs/readme.txt docs/readme$(HTML_SUFFIX) docs/readme$(INFO_SUFFIX) \
   docs/changes.txt docs/changes$(HTML_SUFFIX)
  
--- 91,101 ----
  include misc/$(MAKEFILE_INC)
  
+ 
+ 
  # -------- Set variables --------
  
  DOCS = \
   docs/cbar.txt docs/cbar$(HTML_SUFFIX) docs/cbar$(INFO_SUFFIX) docs/cbar.rtf \
!  readme.txt readme$(HTML_SUFFIX) docs/readme$(INFO_SUFFIX) \
   docs/changes.txt docs/changes$(HTML_SUFFIX)
  
***************
*** 161,165 ****
  	$(LINK_OBJ_TO_LIB)
  
! examples/%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) 
  	$(LINK_OBJ_TO_EXE)
  
--- 165,169 ----
  	$(LINK_OBJ_TO_LIB)
  
! examples/%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME)
  	$(LINK_OBJ_TO_EXE)
  
***************
*** 172,175 ****
--- 176,182 ----
  	-$(MAKEDOC_PROGRAM) -ascii $@ $<
  
+ %$(HTML_SUFFIX): docs/%._tx
+ 	-$(MAKEDOC_PROGRAM) $(_TX_HTML_FLAG) $@ $<
+ 
  docs/%$(HTML_SUFFIX): docs/%._tx
  	-$(MAKEDOC_PROGRAM) $(_TX_HTML_FLAG) $@ $<

Index: zipup.sh
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/zipup.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** zipup.sh	21 Jun 2004 19:18:32 -0000	1.6
--- zipup.sh	18 Sep 2005 19:50:27 -0000	1.7
***************
*** 20,24 ****
  ./fix.sh djgpp --dtou
  make clean
- make rewhisp
  
  # Dont generate dependencies if a parameter was given.
--- 20,23 ----
***************
*** 51,54 ****
--- 50,54 ----
  
  fi
+ 
  echo copy default makefile...
  cp misc/emptymak makefile
***************
*** 59,71 ****
         misc/dllsyms.lst misc/scanexp.c \
         obj/*/*/*.dep lib/*/*.def \
!        docs/readme.txt docs/readme.html docs/cbar.html docs/cbar.txt \
         docs/*._tx \
         src/*.c src/*.h src/*.t src/*.ht \
         examples/*.c examples/*.cfg \
!        resource/* \
         include/*.h include/cbar/*.h"
  
  afiles=`echo $files       | sed -e"s/\([^ ][^ ]*\)/ cbar\/\1/g"`
  
  #############################################################################
  cd ..
--- 59,72 ----
         misc/dllsyms.lst misc/scanexp.c \
         obj/*/*/*.dep lib/*/*.def \
!        readme.txt readme.html docs/readme.info \
         docs/*._tx \
         src/*.c src/*.h src/*.t src/*.ht \
         examples/*.c examples/*.cfg \
!        resource/*.dat resource/cbarlabl  \
         include/*.h include/cbar/*.h"
  
  afiles=`echo $files       | sed -e"s/\([^ ][^ ]*\)/ cbar\/\1/g"`
  
+ 
  #############################################################################
  cd ..
***************
*** 76,80 ****
  
  echo create tar.gz archives...
! tar -cv --no-attributes $afiles | gzip -9  > cbar/cbar-$tgzversion.tar.gz
  
  echo create zip archives...
--- 77,81 ----
  
  echo create tar.gz archives...
! tar -cv $afiles | gzip -9  > cbar/cbar-$tgzversion.tar.gz
  
  echo create zip archives...