[Cpri-develop] cpri/misc makefile.all,1.11,1.12 zipup.sh,1.8,1.9
Brought to you by:
chrisan,
rasmusmyklebust
Menu
▾
▴
[Cpri-develop] cpri/misc makefile.all,1.11,1.12 zipup.sh,1.8,1.9
|
From: Christer S. <ch...@us...> - 2005-09-21 18:39:48
|
Update of /cvsroot/cpri/cpri/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22040/misc Modified Files: makefile.all zipup.sh Log Message: Fixed some build issues Index: makefile.all =================================================================== RCS file: /cvsroot/cpri/cpri/misc/makefile.all,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** makefile.all 8 Nov 2004 22:01:24 -0000 1.11 --- makefile.all 21 Sep 2005 18:39:34 -0000 1.12 *************** *** 6,10 **** # See readme.txt for more information about CPRI. # - # # Available options: # --- 6,9 ---- *************** *** 18,41 **** # docs: Build only the documentation. # clean: Remove rebuildable files. ! # compress: Compress the example executable using upx. # help: Display this help. # # Developer Targets: # ! # dat: Builds the compiled datafiles and the includefile(s) ! # *.ht from *.t # This should actually be part of the default build but ! # for the user conveniance (it needs CGUIDIR to be set) it is pre-built. ! # depend: Regenerate dependencies. # veryclean: Remove rebuildable files, including dependencies. ! # rewhisp: Reformat all text files to unix format using whisped. ! # rewhisp-dos: Reformat all text files to dos format using whisped. ! # zipupd-big: Create developer zip with additional stuff from dos. # # Variables: # # DEBUGMODE=1 Include debug info in the library. # CPRI_FORTIFY=1 Include memory debugger. Sources are not included in the distribution # c-files are assumed to be located in src and h-files in include. ## --- 17,45 ---- # docs: Build only the documentation. # clean: Remove rebuildable files. ! # compress: Compress the example executable using the executable compressing program pointed to by UPX_PROGRAM. # help: Display this help. # # Developer Targets: # ! # dat: Builds the textfile and the includefile(s) *.ht from *.t # This should actually be part of the default build but ! # for the user conveniance it is pre-built. This is needed to build a lib using code ! # checked out from cvs. This target needs the environment variable CGUIDIR to point ! # to the directory of CGUI, and ALLEGRO to point to the directory of Allegro. ! # depend: Regenerate dependencies. This is needed to build a lib using code checked out from cvs. # veryclean: Remove rebuildable files, including dependencies. ! # rewhisp: Reformat all text files to unix format using whisped. This requires the whisped program to in your path. ! # rewhisp-dos: Reformat all text files to dos format using whisped. This requires the whisped program to in your path. # # Variables: # + # ALLEGRO=<directoy-of-allegro-source> See target `dat' above. + # CGUIDIR=<directoy-of-cgui> Needed by target `dat', see above. + # + # UPX_PROGRAM=<program-to-compress-with> See target `compress' above. # DEBUGMODE=1 Include debug info in the library. # CPRI_FORTIFY=1 Include memory debugger. Sources are not included in the distribution # c-files are assumed to be located in src and h-files in include. + # ## *************** *** 113,117 **** DOCS = \ docs/cpri.txt docs/cpri$(HTML_SUFFIX) docs/cpri$(INFO_SUFFIX) docs/cpri.rtf \ ! docs/readme.txt docs/readme$(INFO_SUFFIX) \ docs/changes.txt docs/changes$(HTML_SUFFIX) --- 117,121 ---- DOCS = \ docs/cpri.txt docs/cpri$(HTML_SUFFIX) docs/cpri$(INFO_SUFFIX) docs/cpri.rtf \ ! readme.txt readme$(HTML_SUFFIX) docs/readme$(INFO_SUFFIX) \ docs/changes.txt docs/changes$(HTML_SUFFIX) *************** *** 183,189 **** --- 187,199 ---- chm-docs: docs/cpri.chm + %.txt: docs/%._tx + -$(MAKEDOC_PROGRAM) -ascii $@ $< + docs/%.txt: docs/%._tx -$(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/cpri/cpri/misc/zipup.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** zipup.sh 21 Jun 2004 19:16:02 -0000 1.8 --- zipup.sh 21 Sep 2005 18:39:34 -0000 1.9 *************** *** 20,24 **** ./fix.sh djgpp --dtou #make clean ! make rewhisp # Dont generate dependencies if a parameter was given. --- 20,24 ---- ./fix.sh djgpp --dtou #make clean ! # make rewhisp # Dont generate dependencies if a parameter was given. *************** *** 41,46 **** ./fix.sh djgpp --quick make depend ! ./fix.sh bcc32 --quick ! make depend ./fix.sh djgpp --quick fi --- 41,46 ---- ./fix.sh djgpp --quick make depend ! # ./fix.sh bcc32 --quick ! # make depend ./fix.sh djgpp --quick fi *************** *** 48,52 **** echo generate other files for the distribution... make docs "LFN=y" ! make texts fi --- 48,52 ---- echo generate other files for the distribution... make docs "LFN=y" ! make dat fi *************** *** 59,63 **** fix* misc/*.sh \ obj/*/*/*.dep lib/*/*.def \ ! docs/readme.txt docs/readme.html docs/cpri.html docs/cpri.txt \ resource/cprilabl resource/icons.dat \ docs/*._tx \ --- 59,63 ---- fix* misc/*.sh \ obj/*/*/*.dep lib/*/*.def \ ! readme.txt readme.html docs/cpri.html docs/cpri.txt \ resource/cprilabl resource/icons.dat \ docs/*._tx \ *************** *** 75,82 **** echo remove old archives... rm -f cpri/cpri$zipversion.zip ! rm -f cpri/cpri-$tgzversion.tgz echo create tar.gz archives... ! tar -cv --no-attributes $afiles | gzip -9 > cpri/cpri-$tgzversion.tar.gz echo create zip archives... --- 75,82 ---- echo remove old archives... rm -f cpri/cpri$zipversion.zip ! rm -f cpri/cpri-$tgzversion.tar.gz echo create tar.gz archives... ! tar -cv $afiles | gzip -9 > cpri/cpri-$tgzversion.tar.gz echo create zip archives... |
