cbar-develop — development information, cvs commits etc

[Cbar-develop] cbar/obj/unix/cbar_s tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/unix/cbar_s
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/unix/cbar_s

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/obj/unix/cbar tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/unix/cbar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/unix/cbar

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/obj/djgpp/cbard tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/djgpp/cbard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/djgpp/cbard

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/obj/mingw32/cbard tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/mingw32/cbard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/mingw32/cbard

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/obj/msvc/cbar tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/msvc/cbar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/msvc/cbar

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/obj/msvc/cbard tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/msvc/cbard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/msvc/cbard

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/obj/mingw32/cbar tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/mingw32/cbar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/mingw32/cbar

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/obj/mingw32/cbard_s tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/mingw32/cbard_s
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/mingw32/cbard_s

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/obj/bcc32/cbard_s tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/bcc32/cbard_s
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/bcc32/cbard_s

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/obj/djgpp/cbar tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/djgpp/cbar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/djgpp/cbar

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/obj/mingw32/cbar_s tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/mingw32/cbar_s
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/mingw32/cbar_s

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/obj/msvc/cbard_s tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/msvc/cbard_s
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/msvc/cbard_s

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/obj/msvc/cbar_s tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/msvc/cbar_s
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/msvc/cbar_s

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/obj/bcc32/cbard tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/bcc32/cbard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/bcc32/cbard

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/obj/bcc32/cbar tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/bcc32/cbar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/bcc32/cbar

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/obj/bcc32/cbar_s tmpfile.txt,NONE,1.1

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

Update of /cvsroot/cbar/cbar/obj/bcc32/cbar_s
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12915/obj/bcc32/cbar_s

Added Files:
	tmpfile.txt 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- NEW FILE: tmpfile.txt ---
This file is needed because some unzip programs skip empty directories.

[Cbar-develop] cbar/examples 1_bar.c,1.2,1.3

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

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

Modified Files:
	1_bar.c 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


Index: 1_bar.c
===================================================================
RCS file: /cvsroot/cbar/cbar/examples/1_bar.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** 1_bar.c	29 Mar 2003 00:43:29 -0000	1.2
--- 1_bar.c	4 Feb 2004 06:21:58 -0000	1.3
***************
*** 43,47 ****
     MkMenuBarItem("File", file, NULL);
     editid = AddEditBox(DOWNLEFT, 300, "Received code:", FINT, 0, &read_value);
!    EndMenu();
     DisplayWin();
     SetHotKey(0, shut_down, NULL, 0, 27);
--- 43,47 ----
     MkMenuBarItem("File", file, NULL);
     editid = AddEditBox(DOWNLEFT, 300, "Received code:", FINT, 0, &read_value);
!    EndMenuBar();
     DisplayWin();
     SetHotKey(0, shut_down, NULL, 0, 27);

[Cbar-develop] cbar/docs cbar._tx,1.3,1.4 changes._tx,1.2,1.3 readme._tx,1.3,1.4

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

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

Modified Files:
	cbar._tx changes._tx readme._tx 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


Index: cbar._tx
===================================================================
RCS file: /cvsroot/cbar/cbar/docs/cbar._tx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cbar._tx	9 Dec 2003 18:48:39 -0000	1.3
--- cbar._tx	4 Feb 2004 06:21:58 -0000	1.4
***************
*** 2,12 ****
  @#The readable documents are generated and will be found in the files:
  @#cbar.txt,cbar.rtf, cbar.htm, cbar.inf, the latter may be
- @#installed as on-line help if you are using rhide (just add cbar to the
- @#list of help files)
  @#
  @multiwordheaders
! @manh="version 1.0.1" "CBAR" "Manual"
  @document_title=CBAR Manual
! @rtfh=cbar  - an add on lib to CGUI for reading bar codes
  @$\input texinfo
  @$@setfilename cbar.inf
--- 2,10 ----
  @#The readable documents are generated and will be found in the files:
  @#cbar.txt,cbar.rtf, cbar.htm, cbar.inf, the latter may be
  @#
  @multiwordheaders
! @manh="version 0.9.2" "CBAR" "Manual"
  @document_title=CBAR Manual
! @rtfh=cbar  - an add on lib to CGUI for bar code reading
  @$\input texinfo
  @$@setfilename cbar.inf
***************
*** 16,22 ****
  @$
  @$@ifinfo
! @$This is the Info version of the cbar manual
  @$
! @$By Christer Sandberg
  @$@end ifinfo
  @$
--- 14,20 ----
  @$
  @$@ifinfo
! @$This is the Info version of the CBAR manual
  @$
! @$By Christer Sandberg 
  @$@end ifinfo
  @$
***************
*** 27,37 ****
  @<body>
  <center><b>CBAR</b></center>
! <center><b>A CGUI and Allegro addon for reading bar codes by Christer Sandberg</b></center>
  <center>Email: <email>chr...@md...</a></center>
  <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center>
  <center><b>
! The Manual of CBAR 1.0.1
  </b></center>
  @!text
  @heading
  Contents
--- 25,37 ----
  @<body>
  <center><b>CBAR</b></center>
! <center><b>A CGUI and Allegro addon for for bar code reading</b></center>
! <center><b>by Christer Sandberg</b></center>
  <center>Email: <email>chr...@md...</a></center>
  <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center>
  <center><b>
! The Manual of CBAR 0.9.3
  </b></center>
  @!text
+ 
  @heading
  Contents

Index: changes._tx
===================================================================
RCS file: /cvsroot/cbar/cbar/docs/changes._tx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** changes._tx	9 Dec 2003 18:48:39 -0000	1.2
--- changes._tx	4 Feb 2004 06:21:58 -0000	1.3
***************
*** 1,3 ****
- @#
  @# This is the source for the CBAR changes file, in Allegro's custom format.
  @# Read allegro/docs/makedoc.c for a description of what is going on...
--- 1,2 ----
***************
*** 5,11 ****
  @#ignore_css
  @multiwordheaders
! @#locale=latin1
! @h=<html><head><title>#</title><body>
! @f=<p><hr><p><a href="changes.html">Back to Contents</a><p>
  @rtfh=Changes in CBAR
  @$\input texinfo
--- 4,8 ----
  @#ignore_css
  @multiwordheaders
! @document_title=CBAR Changes
  @rtfh=Changes in CBAR
  @$\input texinfo
***************
*** 23,27 ****
  @$This is the Info version of the Changes in CBAR file.
  @$
! @$By Christer Sandberg
  @$@end ifinfo
  @$
--- 20,24 ----
  @$This is the Info version of the Changes in CBAR file.
  @$
! @$By Christer Sandberg 
  @$@end ifinfo
  @$
***************
*** 31,41 ****
  @<title>Changes in CBAR</title>
  @<body>
! <center><b>CBAR</b></center>
! <center><b>A CGUI and Allegro addon for reading bar codes by Christer Sandberg</b></center>
  <center>Email: <email>chr...@md...</a></center>
  <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center>
  <center><b>
! Change log of CBAR
  </b></center>
  
  @heading
--- 28,39 ----
  @<title>Changes in CBAR</title>
  @<body>
! <center><b>A CGUI and Allegro addon for bar code reading</b></center>
! <center><b>by Christer Sandberg</b></center>
  <center>Email: <email>chr...@md...</a></center>
  <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center>
  <center><b>
! The changes log of CBAR
  </b></center>
+ @!text
  
  @heading

Index: readme._tx
===================================================================
RCS file: /cvsroot/cbar/cbar/docs/readme._tx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** readme._tx	4 Jun 2003 18:35:03 -0000	1.3
--- readme._tx	4 Feb 2004 06:21:58 -0000	1.4
***************
*** 1,3 ****
- @#
  @# This is the source for the CBAR readme file, in Allegro's custom format.
  @# Read allegro/docs/makedoc.c for a description of what is going on...
--- 1,2 ----
***************
*** 5,16 ****
  @#ignore_css
  @multiwordheaders
! @#multiplefiles
! @#locale=latin1
! @h=<html><head><title>#</title><body>
! @f=<p><hr><p><a href="readme.html">Back to Contents</a><p>
! @rtfh=Readme for CBAR
  @$\input texinfo
  @$@setfilename readme.inf
! @$@settitle Readme for CBAR
  @$@setchapternewpage odd
  @$@paragraphindent 0
--- 4,12 ----
  @#ignore_css
  @multiwordheaders
! @document_title=CBAR readme
! @rtfh=Readme file of CBAR
  @$\input texinfo
  @$@setfilename readme.inf
! @$@settitle Readme of CBAR
  @$@setchapternewpage odd
  @$@paragraphindent 0
***************
*** 20,24 ****
  @$@ifinfo
  @$@direntry
! @$* CBAR: (CBAR). Readme file for CBAR
  @$@end direntry
  @$This is the Info version of the CBAR readme file.
--- 16,20 ----
  @$@ifinfo
  @$@direntry
! @$* Readme: (readme). Readme in CBAR
  @$@end direntry
  @$This is the Info version of the CBAR readme file.
***************
*** 30,42 ****
  @<html>
  @<head>
! @<title>Readme file for CBAR</title>
  @<body>
! <center><b>CBAR</b></center>
! <center><b>A CGUI and Allegro addon for reading bar codes by Christer Sandberg</b></center>
  <center>Email: <email>chr...@md...</a></center>
  <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center>
! <center><b> Readme file for CBAR </b></center>
  @!text
- 
  @heading
  Contents
--- 26,39 ----
  @<html>
  @<head>
! @<title>Readme file of CBAR</title>
  @<body>
! <center><b>A CGUI and Allegro addon for serial port communication</b></center>
! <center><b>by Christer Sandberg</b></center>
  <center>Email: <email>chr...@md...</a></center>
  <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center>
! <center><b>
! Readme file of CBAR
! </b></center>
  @!text
  @heading
  Contents
***************
*** 159,163 ****
     If you use RHIDE, go to the menu Options/Libraries and fill in cbar. It is
     important that cbar is above ccom, cgui and allegro. Don't forget to
!    check the box to the left of the library. You have to replace ccom with
     cbard to include debugging information.
  <li>
--- 156,160 ----
     If you use RHIDE, go to the menu Options/Libraries and fill in cbar. It is
     important that cbar is above ccom, cgui and allegro. Don't forget to
!    check the box to the left of the library. You have to replace cbar with
     cbard to include debugging information.
  <li>

[Cbar-develop] cbar/misc makefile.all,1.2,1.3 makefile.bcc,1.3,1.4 makefile.dj,1.2,1.3 makefile.mgw,1.3,1.4 makefile.uni,1.2,1.3 makefile.vc,1.3,1.4

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

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

Modified Files:
	makefile.all makefile.bcc makefile.dj makefile.mgw 
	makefile.uni makefile.vc 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


Index: makefile.all
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.all,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** makefile.all	30 Mar 2003 19:57:51 -0000	1.2
--- makefile.all	4 Feb 2004 06:21:59 -0000	1.3
***************
*** 18,21 ****
--- 18,22 ----
  #        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.
***************
*** 42,130 ****
  include misc/makefile.ver
  
  LIB_SOURCE = \
!  bcs.c       \
!  csound.c    \
!  errorlog.c  \
!  reader.c    \
!  unit.c      \
!  labldata.c
  
  EXAMPLES_SOURCE = 1_bar.c
  
- MAKEDOC_FILES = chm doc html man misc rtf texi txt
- MAKEDOC_FILES := $(addprefix misc/makedoc/make,$(MAKEDOC_FILES))
- MAKEDOC_SOURCE := $(addsuffix .c,$(MAKEDOC_FILES))
- MAKEDOC_FILES := $(addsuffix .h,$(MAKEDOC_FILES)) $(MAKEDOC_SOURCE)
  RUNNER_SOURCE = misc/runner.c
  
  CLEAN_FILES = \
!  obj/*/*.o obj/*/*/*.o obj/*/*/*/*.o \
!  obj/*/*.obj obj/*/*/*.obj obj/*/*/*/*.obj \
!  lib/*/*.a lib/*/*/*.a lib/*/*/*/*.a \
!  lib/*.so* lib/*/*.so* lib/*/*/*.so* lib/*/*/*/*.so* \
!  lib/*.lib lib/*/*.lib lib/*/*/*.lib lib/*/*/*/*.lib \
!  lib/*.exp lib/*/*.exp lib/*/*/*.exp lib/*/*/*/*.exp \
!  lib/*/*.pdb lib/*/*.ilk lib/*/*.map *.pdb */*.pdb \
!  */*.ilk */*.map */*.sym gmon.out */gmon.out */*.prf \
!  lib/*.dll lib/*/*.dll lib/*/*/*.dll \
!  *.exe */*.exe \
!  $(addsuffix $(EXE_SUFFIX),$(basename $(EXAMPLES_SOURCE) */$(EXAMPLES_SOURCE))) \
!  *.htm */*.htm *.html */*.html *.rtf */*.rtf *.inf */*.inf *.info */*.info \
!  *.txi */*.txi *.texi */*.texi docs/*.chm docs/*.hhc docs/*.hhk docs/*.hhp \
   *.log */*.log */*/*.log core */core */*/core
  
! VERY_CLEAN_FILES = \
!  */makefile.dep */*/makefile.dep */*/*/makefile.dep */*/*/*/makefile.dep \
!  lib/*.def lib/*/*.def lib/*/*/*.def \
!  changes.txt readme.txt thanks.txt cbar.txt \
!  docs/wishlist.txt docs/internal.txt \
!  src/*.ht $(TEXT_ARCHIVE_X)
  
  VPATH = src examples docs
  
! PACKAGE5_OPTIMIZED = cbar
! PACKAGE4_OPTIMIZED = cbar
! DESCRIPTION_OPTIMIZED = optimized
  
  ifdef DEBUGMODE
! PACKAGE5 = cbard
! PACKAGE4 = cbard
  DESCRIPTION = debugging
  else
! PACKAGE5 = $(PACKAGE5_OPTIMIZED)
! PACKAGE4 = $(PACKAGE4_OPTIMIZED)
! DESCRIPTION = $(DESCRIPTION_OPTIMIZED)
! endif
! 
! # By default, Allegro is linked the same way as cbar, but this can be
! # overridden.
! # Note that it is not a good idea to do anything particular with the
! # STATICLINK_ALLEGRO or NO_STATICLINK_ALLEGRO variables, since it would be
! # bad to have two dlls around with the same name that link differently to
! # Allegro.
! ifdef STATICLINK
! ifndef NO_STATICLINK_ALLEGRO
! STATICLINK_ALLEGRO=1
! endif
  endif
  
- 
- # Tell the platform specific makefile to look for Allegro's makedoc.
- NEED_MAKEDOC = 1
- 
- 
- 
  # -------- Include platform specific makefile. --------
  
  include misc/$(MAKEFILE_INC)
  
- 
- 
  # -------- Set variables --------
  
  DOCS = \
!  cbar.txt docs/cbar$(HTML_SUFFIX) docs/cbar$(INFO_SUFFIX) docs/cbar.rtf \
!  readme.txt docs/readme$(HTML_SUFFIX) docs/readme$(INFO_SUFFIX) \
!  changes.txt docs/changes$(HTML_SUFFIX)
  
  ifndef HAVE_TEXINFO
--- 43,100 ----
  include misc/makefile.ver
  
+ GEN_C_FILES = labldata.c
+ 
+ GEN_H_FILES = $(addsuffix .h,$(basename $(GEN_C_FILES)))
+ 
  LIB_SOURCE = \
!   $(GEN_C_FILES) \
!   bcs.c       \
!   csound.c    \
!   errorlog.c  \
!   reader.c    \
!   unit.c
  
  EXAMPLES_SOURCE = 1_bar.c
  
  RUNNER_SOURCE = misc/runner.c
  
  CLEAN_FILES = \
!  obj/*/*/*.o obj/*/*/*.obj \
!  lib/*/*.a lib/*/*.so* lib/*/*.lib lib/*/*.exp lib/*/*.pdb \
!  lib/*/*.ilk lib/*/*.map lib/*/*.dll \
!  $(addsuffix $(EXE_SUFFIX),$(basename examples/$(EXAMPLES_SOURCE))) \
!  *.htm docs/*.htm *.html docs/*.html docs/*.rtf docs/*.inf docs/*.info \
!  docs/*.txi docs/*.texi docs/*.chm docs/*.hhc docs/*.hhk docs/*.hhp docs/*.txt \
   *.log */*.log */*/*.log core */core */*/core
  
! VERY_CLEAN_FILES = $(CLEAN_FILES) \
!  obj/*/*/makefile.dep \
!  lib/*/*.def \
!  $(CBAR_LABELS) $(CBAR_DAT) $(TEXT_HEADERS) \
!  $(addprefix src/,$(GEN_C_FILES)) \
!  $(addprefix src/,$(GEN_H_FILES))
  
  VPATH = src examples docs
  
! MAKEDOC_PROGRAM := $(CGUIDIR)/misc/makedoc/makedoc$(EXE_SUFFIX)
  
  ifdef DEBUGMODE
! PACKAGE = cbard
  DESCRIPTION = debugging
  else
! PACKAGE = cbar
! DESCRIPTION = optimized
  endif
  
  # -------- Include platform specific makefile. --------
  
  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)
  
  ifndef HAVE_TEXINFO
***************
*** 135,144 ****
  LIB_OBJS = $(addprefix $(OBJ_DIR)/,$(addsuffix $(OBJ_SUFFIX),$(basename $(LIB_SOURCE))))
  endif
! MAKEDOC_OBJS = $(addprefix $(OBJ_DIR)/,$(addsuffix $(OBJ_SUFFIX),$(basename $(notdir $(MAKEDOC_SOURCE)))))
  EXAMPLES_OBJS = $(addprefix $(OBJ_DIR)/,$(addsuffix $(OBJ_SUFFIX),$(basename $(EXAMPLES_SOURCE))))
  EXAMPLES_NAME = $(addprefix examples/,$(addsuffix $(EXE_SUFFIX),$(basename $(EXAMPLES_SOURCE))))
  
- 
- 
  # -------- Compile --------
  
--- 105,112 ----
  LIB_OBJS = $(addprefix $(OBJ_DIR)/,$(addsuffix $(OBJ_SUFFIX),$(basename $(LIB_SOURCE))))
  endif
! 
  EXAMPLES_OBJS = $(addprefix $(OBJ_DIR)/,$(addsuffix $(OBJ_SUFFIX),$(basename $(EXAMPLES_SOURCE))))
  EXAMPLES_NAME = $(addprefix examples/,$(addsuffix $(EXE_SUFFIX),$(basename $(EXAMPLES_SOURCE))))
  
  # -------- Compile --------
  
***************
*** 172,175 ****
--- 140,145 ----
  	@echo The $(DESCRIPTION) library for $(PLATFORM) has been compiled.
  	@echo Run make install to complete the installation.
+ 	@echo $(OBJ_DIR)/%$(OBJ_SUFFIX)
+ 
  
  clean:
***************
*** 177,181 ****
  
  veryclean:
! 	-rm -fv $(VERY_CLEAN_FILES) $(CLEAN_FILES)
  
  compress:
--- 147,151 ----
  
  veryclean:
! 	-rm -fv $(VERY_CLEAN_FILES)
  
  compress:
***************
*** 187,191 ****
  endif
  
! $(OBJ_DIR)/%$(OBJ_SUFFIX): %.c $(COMPILE_C_TO_OBJ_DEPS) $(SYSTEM_INCLUDE_DIR)/cgui.h $(SYSTEM_INCLUDE_DIR)/ccom.h
  	$(COMPILE_C_TO_OBJ)
  
--- 157,161 ----
  endif
  
! $(OBJ_DIR)/%$(OBJ_SUFFIX): %.c $(COMPILE_C_TO_OBJ_DEPS)
  	$(COMPILE_C_TO_OBJ)
  
***************
*** 193,230 ****
  	$(LINK_OBJ_TO_LIB)
  
! ifndef NATIVE_LINK_OBJ_TO_EXE
! */%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE_DEPS)
  	$(LINK_OBJ_TO_EXE)
  
- ifneq ($(MAKEDOC_DEP),)
- $(MAKEDOC_DEP): $(MAKEDOC_OBJS) $(LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS)
- 	$(LINK_ALL_OBJ_TO_EXE_NOLIB)
- 
- $(OBJ_DIR)/make%$(OBJ_SUFFIX): misc/makedoc/make%.c $(COMPILE_C_TO_OBJ_DEPS)
- 	$(COMPILE_C_TO_OBJ)
- endif
- 
  ifneq ($(RUNNER_DEP),)
  $(RUNNER): $(RUNNER_SOURCE)
  	$(COMPILE_RUNNER)
  endif
- endif
  
  chm-docs: docs/cbar.chm
  
! %.txt: docs/%._tx $(MAKEDOC_DEP)
  	-$(MAKEDOC_PROGRAM) -ascii $@ $<
  
! docs/%.txt: docs/%._tx $(MAKEDOC_DEP)
  	-$(MAKEDOC_PROGRAM) -ascii $@ $<
  
! docs/%$(HTML_SUFFIX): docs/%._tx $(MAKEDOC_DEP)
  	-$(MAKEDOC_PROGRAM) $(_TX_HTML_FLAG) $@ $<
  
! docs/%.rtf: docs/%._tx $(MAKEDOC_DEP)
  	-$(MAKEDOC_PROGRAM) -rtf $@ $<
  
! docs/cbar.chm: $(filter %$(HTML_SUFFIX),$(DOCS)) docs/cbar._tx $(MAKEDOC_DEP)
! 	$(MAKEDOC_PROGRAM) -chm docs/cbar.html docs/cbar._tx
  	-hhc docs/cbar.hhp
  
--- 163,190 ----
  	$(LINK_OBJ_TO_LIB)
  
! examples/%$(EXE_SUFFIX): $(OBJ_DIR)/%$(OBJ_SUFFIX) $(LIB_NAME) $(LINK_OBJ_TO_EXE_DEPS)
  	$(LINK_OBJ_TO_EXE)
  
  ifneq ($(RUNNER_DEP),)
  $(RUNNER): $(RUNNER_SOURCE)
  	$(COMPILE_RUNNER)
  endif
  
  chm-docs: docs/cbar.chm
  
! %.txt: docs/%._tx
  	-$(MAKEDOC_PROGRAM) -ascii $@ $<
  
! docs/%.txt: docs/%._tx
  	-$(MAKEDOC_PROGRAM) -ascii $@ $<
  
! docs/%$(HTML_SUFFIX): docs/%._tx
  	-$(MAKEDOC_PROGRAM) $(_TX_HTML_FLAG) $@ $<
  
! docs/%.rtf: docs/%._tx
  	-$(MAKEDOC_PROGRAM) -rtf $@ $<
  
! docs/cbar.chm: $(filter %$(HTML_SUFFIX),$(DOCS)) docs/cbar._tx
! 	-$(MAKEDOC_PROGRAM) -chm docs/cbar.html docs/cbar._tx
  	-hhc docs/cbar.hhp
  
***************
*** 233,237 ****
  	-makeinfo --no-split -o $@ $<
  
! docs/%$(TEXI_SUFFIX): docs/%._tx $(MAKEDOC_DEP)
  	-$(MAKEDOC_PROGRAM) $(_TX_TEXI_FLAG) $@ $<
  endif
--- 193,197 ----
  	-makeinfo --no-split -o $@ $<
  
! docs/%$(TEXI_SUFFIX): docs/%._tx
  	-$(MAKEDOC_PROGRAM) $(_TX_TEXI_FLAG) $@ $<
  endif
***************
*** 240,244 ****
  
  ALLEGRO_DAT_X = $(ALLEGRO)/tools/dat
! ALLEGRO_DAT2C_X = $(ALLEGRO)/tools/dat2c
  MKTEXT_X = $(subst \,/,$(CGUIDIR)/tools/mktext)$(EXE_SUFFIX)
  CBAR_DAT_C_X = src/labldata.c
--- 200,204 ----
  
  ALLEGRO_DAT_X = $(ALLEGRO)/tools/dat
! CGUI_DAT2C_X = $(CGUIDIR)/tools/dat2c
  MKTEXT_X = $(subst \,/,$(CGUIDIR)/tools/mktext)$(EXE_SUFFIX)
  CBAR_DAT_C_X = src/labldata.c
***************
*** 251,263 ****
  dat: $(CBAR_DAT_C_X)
  
! $(CBAR_DAT_C_X): $(CBAR_DAT_X)
! 	-$(ALLEGRO_DAT2C) $(CBAR_DAT) -o $(CBAR_DAT_C) -h $(CBAR_DAT_H) -p cbar -g -n labels
  
  $(CBAR_DAT_X): $(CBAR_LABELS_X)
  	-$(ALLEGRO_DAT) $(CBAR_DAT) -a $(CBAR_LABELS)
  
- #$(CBAR_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X) $(MKTEXT_X)
  $(CBAR_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X)
! 	$(MKTEXT) -o$(CBAR_LABELS) $(TEXT_SOURCES)
  # -------- Misc stuff --------
  
--- 211,223 ----
  dat: $(CBAR_DAT_C_X)
  
! $(CBAR_DAT_C) $(CBAR_DAT_H): $(CBAR_DAT_X)
! 	-$(CGUI_DAT2C) $(CBAR_DAT) -o $(CBAR_DAT_C) -h $(CBAR_DAT_H) -p cbar -g -n labels
  
  $(CBAR_DAT_X): $(CBAR_LABELS_X)
  	-$(ALLEGRO_DAT) $(CBAR_DAT) -a $(CBAR_LABELS)
  
  $(CBAR_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X)
! 	-$(MKTEXT) -o$(CBAR_LABELS) $(TEXT_SOURCES)
! 
  # -------- Misc stuff --------
  

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.bcc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** makefile.bcc	9 Dec 2003 18:48:39 -0000	1.3
--- makefile.bcc	4 Feb 2004 06:21:59 -0000	1.4
***************
*** 155,179 ****
  
  
- # -------- Find Allegro, runner and makedoc. --------
- 
- NEED_ALLEGRO = 1
- 
- .PHONY: badalleg
- 
- ifdef ALLEGRO
- ALLEGRODIR_U = $(subst \,/,$(ALLEGRO))
- else
- badalleg:
- 	@echo Couldnt find Allegro!
- 	@echo Is your ALLEGRO environment variable set correctly? It should
- 	@echo point to the place where Allegro lives, e.g.
- 	@echo "set ALLEGRO=c:\allegro".
- endif
- 
- 
- ifdef NEED_MAKEDOC
- include misc/makefile.doc
- endif
- 
  # -------- Set up mktext --------
  ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
--- 155,158 ----
***************
*** 193,198 ****
  _default: default
  
- 
- 
  # -------- decide what compiler options to use --------
  
--- 172,175 ----
***************
*** 208,212 ****
  SFLAGS = -DDEBUGMODE=$(DEBUGMODE)
  LFLAGS = /q /Gn /v
! ifdef STATICLINK_ALLEGRO
  LIB_FLAGS = ccomd_s.lib cguid_s.lib alld_s.lib
  else
--- 185,189 ----
  SFLAGS = -DDEBUGMODE=$(DEBUGMODE)
  LFLAGS = /q /Gn /v
! ifdef STATICLINK
  LIB_FLAGS = ccomd_s.lib cguid_s.lib alld_s.lib
  else
***************
*** 219,223 ****
  SFLAGS = $(WFLAGS)
  LFLAGS = /q /Gn /v
! ifdef STATICLINK_ALLEGRO
  LIB_FLAGS = ccom_s.lib cgui_s.lib allp_s.lib
  else
--- 196,200 ----
  SFLAGS = $(WFLAGS)
  LFLAGS = /q /Gn /v
! ifdef STATICLINK
  LIB_FLAGS = ccom_s.lib cgui_s.lib allp_s.lib
  else
***************
*** 230,234 ****
  LFLAGS = /x /q /Gn
  DELETE_TDS_FILES = 1
! ifdef STATICLINK_ALLEGRO
  LIB_FLAGS = ccom_s.lib cgui_s.lib alleg_s.lib
  else
--- 207,211 ----
  LFLAGS = /x /q /Gn
  DELETE_TDS_FILES = 1
! ifdef STATICLINK
  LIB_FLAGS = ccom_s.lib cgui_s.lib alleg_s.lib
  else

Index: makefile.dj
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.dj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** makefile.dj	9 Dec 2003 18:48:39 -0000	1.2
--- makefile.dj	4 Feb 2004 06:21:59 -0000	1.3
***************
*** 100,136 ****
  endif
  
- 
- # -------- Find Allegro and makedoc. --------
- 
- ifdef NEED_MAKEDOC
- ifndef NEED_ALLEGRO
- ifeq ($(wildcard $(MAKEDOC_SOURCE)),)
- NEED_ALLEGRO = 1
- endif
- endif
- endif
- 
- ifdef NEED_ALLEGRO
- .PHONY: badalleg
- 
- ifdef ALLEGRO
- ALLEGRODIR_U = $(subst \,/,$(ALLEGRO))
- else
- badalleg:
- 	@echo Couldnt find Allegro!
- 	@echo Is your ALLEGRO environment variable set correctly? It should
- 	@echo point to the place where Allegro lives, e.g. c:\djgpp\allegro. Run
- 	@echo    make ALLEGRO=c:\djgpp\allegro
- 	@echo (or whatever the location of Allegro is).
- 	@echo See also readme.txt
- endif
- 
- endif # ifdef NEED_ALLEGRO
- 
- 
- ifdef NEED_MAKEDOC
- include misc/makefile.doc
- endif
- 
  # -------- Set up mktext --------
  ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
--- 100,103 ----

Index: makefile.mgw
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.mgw,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** makefile.mgw	9 Dec 2003 18:48:39 -0000	1.3
--- makefile.mgw	4 Feb 2004 06:21:59 -0000	1.4
***************
*** 3,13 ****
  #
  #  By Christer Sandberg (ported from Adime made by Sven Sandberg)
- #
  #  See readme.txt for more information about CBAR.
- #
  #  See makefile.all for a list of the available targets.
  
- 
- 
  # -------- Define some variables that the primary makefile may use. --------
  
--- 3,9 ----
***************
*** 134,166 ****
  endif
  
- 
- # -------- Find Allegro and makedoc. --------
- ifdef NEED_MAKEDOC
- ifndef NEED_ALLEGRO
- ifeq ($(wildcard $(MAKEDOC_SOURCE)),)
- NEED_ALLEGRO = 1
- endif
- endif
- endif
- 
- ifdef NEED_ALLEGRO
- .PHONY: badalleg
- 
- ifdef ALLEGRO
- ALLEGRODIR_U = $(subst \,/,$(ALLEGRO))
- else
- badalleg:
- 	@echo Couldnt find Allegro!
- 	@echo Is your ALLEGRO environment variable set correctly? It should
- 	@echo point to the place where Allegro lives, e.g. c:\mingw32\allegro.
- endif
- 
- endif # ifdef NEED_ALLEGRO
- 
- 
- ifdef NEED_MAKEDOC
- include misc/makefile.doc
- endif
- 
  # -------- Give a sensible default target for make without any args. --------
  # This must be done right after the tests, which can generate error targets.
--- 130,133 ----
***************
*** 170,175 ****
  _default: default
  
- 
- 
  # -------- Decide what compiler options and libraries to use. --------
  
--- 137,140 ----
***************
*** 192,228 ****
  
  ifdef DEBUGMODE
! # -------- debugging build --------
! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g
! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS)
! LFLAGS += -g
! ifdef STATICLINK_ALLEGRO
! LIB_FLAGS = -lccomd_s -lcguid_s -lalld_s
! else
! LIB_FLAGS = -lccomd -lcguid -lalld
! endif
! else
! ifdef PROFILEMODE
! # -------- profiling build --------
! CFLAGS = $(WFLAGS) $(OFLAGS) -pg
! SFLAGS = $(WFLAGS)
! LFLAGS += -pg
! ifdef STATICLINK_ALLEGRO
! LIB_FLAGS = -lccom_s -lcgui_s -lallp_s
! else
! LIB_FLAGS = -lccom -lcgui -lallp
! endif
! else
! # -------- optimised build --------
! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce
! SFLAGS = $(WFLAGS)
! ifndef SYMBOLMODE
! LFLAGS += -s
! endif
! ifdef STATICLINK_ALLEGRO
! LIB_FLAGS = -lccom_s -lcgui_s -lalleg_s
  else
! LIB_FLAGS = -lccom -lcgui -lalleg
! endif
! endif
  endif
  
--- 157,194 ----
  
  ifdef DEBUGMODE
!  # -------- debugging build --------
!  CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g
!  SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS)
!  LFLAGS += -g
! 
!  ifdef STATICLINK
!   LIB_FLAGS = -lccomd_s -lcguid_s -lalld_s
!  else
!   LIB_FLAGS = -lccomd -lcguid -lalld
!  endif
  else
!  ifdef PROFILEMODE
!   # -------- profiling build --------
!   CFLAGS = $(WFLAGS) $(OFLAGS) -pg
!   SFLAGS = $(WFLAGS)
!   LFLAGS += -pg
!   ifdef STATICLINK
!    LIB_FLAGS = -lccom_s -lcgui_s -lallp_s
!   else
!    LIB_FLAGS = -lccom -lcgui -lallp
!   endif
!  else
!   # -------- optimised build --------
!   CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce
!   SFLAGS = $(WFLAGS)
!   ifndef SYMBOLMODE
!    LFLAGS += -s
!   endif
!   ifdef STATICLINK
!    LIB_FLAGS = -lccom_s -lcgui_s -lalleg_s
!   else
!    LIB_FLAGS = -lccom -lcgui -lalleg
!   endif
!  endif
  endif
  
***************
*** 236,244 ****
  LFLAGS += -L$(SYSTEM_LIB_DIR)
  
! ifdef STATICLINK_ALLEGRO
! CFLAGS += -DALLEGRO_STATICLINK
! CFLAGS_NO_OPTIMIZE = $(WFLAGS) -DALLEGRO_STATICLINK
  else
! CFLAGS_NO_OPTIMIZE = $(WFLAGS)
  endif
  
--- 202,210 ----
  LFLAGS += -L$(SYSTEM_LIB_DIR)
  
! ifdef STATICLINK
!  CFLAGS += -DALLEGRO_STATICLINK
!  CFLAGS_NO_OPTIMIZE = $(WFLAGS) -DALLEGRO_STATICLINK
  else
!  CFLAGS_NO_OPTIMIZE = $(WFLAGS)
  endif
  

Index: makefile.uni
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.uni,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** makefile.uni	9 Dec 2003 18:48:39 -0000	1.2
--- makefile.uni	4 Feb 2004 06:21:59 -0000	1.3
***************
*** 37,58 ****
  
  ifdef STATICLINK
- 
  # link as a static library
! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)_s
! IMPLIB_BASENAME = lib$(PACKAGE5)_s.a
! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
! LIB_NAME = $(IMPLIB_NAME)
! 
  else
- 
  # link as a shared object
! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)
! IMPLIB_BASENAME = lib$(PACKAGE5).so
! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
! LIB_NAME = $(IMPLIB_NAME)
! 
  endif
  
! 
  
  # -------- Default system paths. ------------
--- 37,51 ----
  
  ifdef STATICLINK
  # link as a static library
! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)_s
! IMPLIB_BASENAME = lib$(PACKAGE)_s.a
  else
  # link as a shared object
! OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE)
! IMPLIB_BASENAME = lib$(PACKAGE).so
  endif
  
! IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
! LIB_NAME = $(IMPLIB_NAME)
  
  # -------- Default system paths. ------------
***************
*** 64,74 ****
  SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib
  
- 
  # -------- Set up mktext --------
  ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X))
  CBAR_DAT = $(subst \,/,$(CBAR_DAT_X))
  CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X))
  CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X))
  CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X))
  TEXT_SOURCES  = $(subst \,/,$(TEXT_SOURCES_X))
--- 57,69 ----
  SYSTEM_LIB_DIR = $(SYSTEM_DIR)/lib
  
  # -------- Set up mktext --------
  ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
! CGUI_DAT2C = $(subst \,/,$(CGUI_DAT2C_X))
  CBAR_DAT = $(subst \,/,$(CBAR_DAT_X))
  CBAR_DAT_C = $(subst \,/,$(CBAR_DAT_C_X))
  CBAR_DAT_H = $(subst \,/,$(CBAR_DAT_H_X))
+ CBAR_ICONS = $(subst \,/,$(CBAR_ICONS_X))
+ CBAR_ICONS_C = $(subst \,/,$(CBAR_ICONS_C_X))
+ CBAR_ICONS_H = $(subst \,/,$(CBAR_ICONS_H_X))
  CBAR_LABELS = $(subst \,/,$(CBAR_LABELS_X))
  TEXT_SOURCES  = $(subst \,/,$(TEXT_SOURCES_X))
***************
*** 77,121 ****
  
  
- # -------- Find Allegro and makedoc. --------
- 
- ifdef NEED_MAKEDOC
- ifndef NEED_ALLEGRO
- ifeq ($(wildcard $(MAKEDOC_SOURCE)),)
- NEED_ALLEGRO = 1
- endif
- endif
- endif
- 
- ifdef NEED_ALLEGRO
- .PHONY: badalleg
- 
- ifdef ALLEGRO
- ALLEGRODIR_U = $(subst \,/,$(ALLEGRO))
- else
- badalleg:
- 	@echo Couldnt find Allegro!
- 	@echo Is your ALLEGRO environment variable set correctly? It should
- 	@echo point to the place where Allegro lives.
- endif
- 
- endif # ifdef NEED_ALLEGRO
- 
- 
- ifdef NEED_MAKEDOC
- include misc/makefile.doc
- endif
- 
- 
- # -------- Set up mktext --------
- ALLEGRO_DAT = $(ALLEGRO_DAT_X)
- ALLEGRO_DAT2C = $(ALLEGRO_DAT2C_X)
- CPRI_DAT = $(CPRI_DAT_X)
- CPRI_DAT_C = $(CPRI_DAT_C_X)
- CPRI_DAT_H = $(CPRI_DAT_H_X)
- CPRI_LABELS = $(CPRI_LABELS)
- TEXT_SOURCES  = $(TEXT_SOURCES_X)
- TEXT_HEADERS = $(TEXT_HEADERS_X)
- MKTEXT = $(MKTEXT_X)
- 
  # -------- Give a sensible default target for make without any args. --------
  # This must be done right after the tests, which can generate error targets.
--- 72,75 ----
***************
*** 125,130 ****
  _default: default
  
- 
- 
  # -------- Decide what compiler options and libraries to use. --------
  
--- 79,82 ----
***************
*** 139,178 ****
  OFLAGS = -mcpu=pentium -O6 -ffast-math
  else
! ifdef PENTIUMONLY
! OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math
! else
! OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math
! endif
  endif
  
! ifdef STATICLINK_ALLEGRO
! ALLEGRO_CONFIG_FLAGS = --static
  else
! ALLEGRO_CONFIG_FLAGS = --shared
  endif
  
  ifdef DEBUGMODE
! # debugging build
! CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g
! SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS)
! LFLAGS += -g
! LIB_FLAGS = `allegro-config --libs debug $(ALLEGRO_CONFIG_FLAGS)`
! else
! ifdef PROFILEMODE
! # profiling build
! CFLAGS = $(WFLAGS) $(OFLAGS) -pg
! SFLAGS = $(WFLAGS)
! LFLAGS += -pg
! LIB_FLAGS = `allegro-config --libs profile $(ALLEGRO_CONFIG_FLAGS)`
  else
! # optimised build
! CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce
! SFLAGS = $(WFLAGS)
! ifndef SYMBOLMODE
! LFLAGS += -s
! LIB_FLAGS = `allegro-config --libs release $(ALLEGRO_CONFIG_FLAGS)`
! endif
! endif
! endif
  
  ifdef CBAR_DEVELOPING
--- 91,128 ----
  OFLAGS = -mcpu=pentium -O6 -ffast-math
  else
!  ifdef PENTIUMONLY
!  OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math
!  else
!  OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math
!  endif
  endif
  
! ifdef STATICLINK
!  AL_CONF_OPTION = --static
!  LIB_FLAGS = -lccom_s -lcgui_s
  else
!  AL_CONF_OPTION = --shared
!  LIB_FLAGS = -lccom -lcgui
  endif
  
  ifdef DEBUGMODE
!  CFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g
!  SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS)
!  LFLAGS += -g
!  AL_CONF_LIB = debug
  else
!  ifdef PROFILEMODE
!   CFLAGS = $(WFLAGS) $(OFLAGS) -pg
!   SFLAGS = $(WFLAGS)
!   LFLAGS += -pg
!   AL_CONF_LIB = profile
!  else # optimised build
!   CFLAGS = $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -fno-strength-reduce
!   SFLAGS = $(WFLAGS)
!   AL_CONF_LIB = release
!  endif
! endif # DEBUGMODE
! 
! LIB_FLAGS += `allegro-config --libs $(AL_CONF_LIB) $(AL_CONF_OPTION)`
  
  ifdef CBAR_DEVELOPING
***************
*** 189,193 ****
  
  ifdef STATICLINK
! COMPILE_FLAGS += -DCBAR_STATICLINK
  endif
  
--- 139,143 ----
  
  ifdef STATICLINK
! COMPILE_FLAGS += -DCBAR_STATICLINK -DCGUI_STATICLINK -DALLEGRO_STATICLINK
  endif
  
***************
*** 253,257 ****
  LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS =
  define LINK_ALL_OBJ_TO_EXE_NOLIB
! gcc $(LFLAGS) -o $@ $^ $(LIB_FLAGS)
  endef
  
--- 203,207 ----
  LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS =
  define LINK_ALL_OBJ_TO_EXE_NOLIB
! gcc $(LFLAGS) -o $@ $^
  endef
  
***************
*** 281,291 ****
  LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS =
  define LINK_ALL_OBJ_TO_EXE_NOLIB
! gcc $(LFLAGS) -o $@ $^ $(LIB_FLAGS)
  endef
  
  endif # ifdef STATICLINK
  
- 
- 
  # -------- Rules for installing and removing the library files. --------
  
--- 231,239 ----
  LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS =
  define LINK_ALL_OBJ_TO_EXE_NOLIB
! gcc $(LFLAGS) -o $@ $^
  endef
  
  endif # ifdef STATICLINK
  
  # -------- Rules for installing and removing the library files. --------
  
***************
*** 306,310 ****
  
  
! INSTALL_HEADERS = $(addprefix $(SYSTEM_DIR)/,$(wildcard include/ccbar/*.h))
  
  INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \
--- 254,258 ----
  
  
! INSTALL_HEADERS = $(addprefix $(SYSTEM_DIR)/,$(wildcard include/cbar/*.h))
  
  INSTALL_FILES = $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME) \
***************
*** 315,336 ****
  	@echo The $(DESCRIPTION) UNIX library has been installed.
  
! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcbar.a $(SYSTEM_LIB_DIR)/libcbard.a \
   $(SYSTEM_INCLUDE_DIR)/cbar.h
- # $(WINDIR_U)/cbar$(LIB_VERSION).dll $(WINDIR_U)/cbar$(LIB_VERSION).dll
  
  uninstall:
  	-rm -fv $(UNINSTALL_FILES)
  	@echo All gone!
  
- 
- 
- # -------- Compile anything that can't be done in makefile.all. --------
- 
- examples/ex%: $(OBJ_DIR)/ex%$(OBJ_SUFFIX)
- 	$(LINK_OBJ_TO_EXE)
- 
- NATIVE_LINK_OBJ_TO_EXE = 1
- 
- 
  # -------- generate automatic dependencies --------
  
--- 263,275 ----
  	@echo The $(DESCRIPTION) UNIX library has been installed.
  
! UNINSTALL_FILES = $(SYSTEM_LIB_DIR)/libcbar_s.a $(SYSTEM_LIB_DIR)/libcbard_s.a \
!  $(SYSTEM_LIB_DIR)/libcbar.so $(SYSTEM_LIB_DIR)/libcbard.so \
   $(SYSTEM_INCLUDE_DIR)/cbar.h
  
  uninstall:
  	-rm -fv $(UNINSTALL_FILES)
+ 	-rm -frv $(SYSTEM_INCLUDE_DIR)/cbar
  	@echo All gone!
  
  # -------- generate automatic dependencies --------
  

Index: makefile.vc
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.vc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** makefile.vc	9 Dec 2003 18:48:39 -0000	1.3
--- makefile.vc	4 Feb 2004 06:21:59 -0000	1.4
***************
*** 3,12 ****
  #
  #  By Christer Sandberg (ported from Adime made by Sven Sandberg).
- #
  #  See readme.txt for more information about CBAR.
- #
  #  See makefile.all for a list of the available targets.
  #
- #
  #  To path MSVC so it can be used from the commandline, run the
  #  vcvars32.bat file which can be found in your MSVC bin directory.
--- 3,9 ----
***************
*** 17,22 ****
  #  The "depend" target uses sed.
  
- 
- 
  # -------- define some variables that the primary makefile will use --------
  
--- 14,17 ----
***************
*** 155,186 ****
  endif
  
! # -------- Find Allegro, runner and makedoc. --------
! 
! ifndef NEED_ALLEGRO
! ifeq ($(wildcard docs/makedoc.c),)
! NEED_ALLEGRO = 1
! else
! ifeq ($(wildcard src/misc/runner.c),)
! NEED_ALLEGRO = 1
! endif
! endif
! endif
! 
! .PHONY: badalleg
! 
! ifdef NEED_ALLEGRO
! ifdef ALLEGRO
! ALLEGRODIR_U = $(subst \,/,$(ALLEGRO))
! else
! badalleg:
! 	@echo Couldnt find Allegro!
! 	@echo Is your ALLEGRO environment variable set correctly? It should
! 	@echo point to the place where Allegro lives, e.g.
! 	@echo "set ALLEGRO=c:\msvc\allegro".
! endif
! endif
! 
  
- ifneq ($(wildcard $(RUNNER_SOURCE)),)
  RUNNER := obj/msvc/runner.exe
  RUNNER_DEP := obj/msvc/runner.exe
--- 150,155 ----
  endif
  
! # -------- Setup runner --------
  
  RUNNER := obj/msvc/runner.exe
  RUNNER_DEP := obj/msvc/runner.exe
***************
*** 188,208 ****
  gcc -O -Wall -Werror -o $(RUNNER) $(RUNNER_SOURCE)
  endef
- else
- RUNNER := $(wildcard $(ALLEGRODIR_U)/obj/msvc/runner.exe)
- RUNNER_DEP :=
- ifeq ($(RUNNER),)
- .PHONY: badrunner
- badrunner:
- 	@echo Couldnt find Allegros runner utility.
- 	@echo Have you forgotten to make Allegro? You need to make the MSVC version of
- 	@echo Allegro before making the MSVC version of CBAR.
- 	@echo Alternatively, download the dimalleg.zip package from CBAR's homepage.
- endif
- endif
- 
- 
- ifdef NEED_MAKEDOC
- include misc/makefile.doc
- endif
  
  # -------- Set up mktext --------
--- 157,160 ----
***************
*** 223,228 ****
  _default: default
  
- 
- 
  # -------- decide what compiler options to use --------
  
--- 175,178 ----
***************
*** 238,268 ****
  SFLAGS = -DDEBUGMODE=$(DEBUGMODE) -Wall
  LFLAGS = -debug -debugtype:cv
! ifdef STATICLINK_ALLEGRO
! LIB_FLAGS = ccomd_s.lib cguid_s.lib alld_s.lib
! else
! LIB_FLAGS = ccomd.lib cguid.lib alld.lib
! endif
! else
! ifdef PROFILEMODE
! # -------- profiling build --------
! CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD
! SFLAGS = -Wall
! LFLAGS = -profile
! ifdef STATICLINK_ALLEGRO
! LIB_FLAGS = ccom_s.lib cgui_s.lib allp_s.lib
! else
! LIB_FLAGS = ccom.lib cgui.lib allp.lib
! endif
  else
  # -------- optimised build --------
! CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD
! SFLAGS = -Wall
! LFLAGS = -release
! ifdef STATICLINK_ALLEGRO
! LIB_FLAGS = ccom_s.lib cgui_s.lib alleg_s.lib
! else
! LIB_FLAGS = ccom.lib cgui.lib alleg.lib
! endif
! endif
  endif
  
--- 188,220 ----
  SFLAGS = -DDEBUGMODE=$(DEBUGMODE) -Wall
  LFLAGS = -debug -debugtype:cv
! 
!  ifdef STATICLINK
!   LIB_FLAGS = ccomd_s.lib cguid_s.lib alld_s.lib
!  else
!   LIB_FLAGS = ccomd.lib cguid.lib alld.lib
!  endif
  else
+  ifdef PROFILEMODE
+   # -------- profiling build --------
+   CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD
+   SFLAGS = -Wall
+   LFLAGS = -profile
+ 
+   ifdef STATICLINK
+    LIB_FLAGS = ccom_s.lib cgui_s.lib allp_s.lib
+   else
+    LIB_FLAGS = ccom.lib cgui.lib allp.lib
+   endif
+  else
  # -------- optimised build --------
!   CFLAGS = $(WFLAGS) -Gd -Ox -GB -MD
!   SFLAGS = -Wall
!   LFLAGS = -release
!   ifdef STATICLINK
!    LIB_FLAGS = ccom_s.lib cgui_s.lib alleg_s.lib
!   else
!    LIB_FLAGS = ccom.lib cgui.lib alleg.lib
!   endif
!  endif
  endif
  

[Cbar-develop] cbar/obj/unix/cbard_s makefile.dep,1.1.1.1,NONE

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

Update of /cvsroot/cbar/cbar/obj/unix/cbard_s
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2656/obj/unix/cbard_s

Removed Files:
	makefile.dep 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- makefile.dep DELETED ---

[Cbar-develop] cbar/obj/unix/cbard makefile.dep,1.1.1.1,NONE

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

Update of /cvsroot/cbar/cbar/obj/unix/cbard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2656/obj/unix/cbard

Removed Files:
	makefile.dep 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- makefile.dep DELETED ---

[Cbar-develop] cbar/obj/msvc/cbar makefile.dep,1.1.1.1,NONE

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

Update of /cvsroot/cbar/cbar/obj/msvc/cbar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2656/obj/msvc/cbar

Removed Files:
	makefile.dep 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- makefile.dep DELETED ---

[Cbar-develop] cbar/obj/djgpp/cbard makefile.dep,1.1.1.1,NONE

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

Update of /cvsroot/cbar/cbar/obj/djgpp/cbard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2656/obj/djgpp/cbard

Removed Files:
	makefile.dep 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- makefile.dep DELETED ---

[Cbar-develop] cbar/obj/msvc/cbard_s makefile.dep,1.1.1.1,NONE

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

Update of /cvsroot/cbar/cbar/obj/msvc/cbard_s
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2656/obj/msvc/cbard_s

Removed Files:
	makefile.dep 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- makefile.dep DELETED ---

[Cbar-develop] cbar/obj/unix/cbar makefile.dep,1.1.1.1,NONE

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

Update of /cvsroot/cbar/cbar/obj/unix/cbar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2656/obj/unix/cbar

Removed Files:
	makefile.dep 
Log Message:
888698 Doesn't build on Linux
Replaced dependfiles with stubs.
Cleaned up docs.
Removed makedoc build stuff (changed to use cgui's makedoc)


--- makefile.dep DELETED ---