OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 11-Aug-2003 13:34:26
Branch: HEAD Handle: 2003081112342402
Added files:
openpkg-src/sam2p Makedep
Modified files:
openpkg-src/sam2p sam2p.spec
openpkg-web news.txt
Log:
dynamic Makefile generation is broken, provide a static Makefile
(Makedep) as a workaround
Summary:
Revision Changes Path
1.1 +223 -0 openpkg-src/sam2p/Makedep
1.6 +11 -3 openpkg-src/sam2p/sam2p.spec
1.6124 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sam2p/Makedep
============================================================================
$ cvs diff -u -r0 -r1.1 Makedep
--- /dev/null 2003-08-11 13:34:26.000000000 +0200
+++ Makedep 2003-08-11 13:34:26.000000000 +0200
@@ -0,0 +1,223 @@
+CCALL=$(CC) $(CFLAGS) $(CFLAGSB) $(CPPFLAGS) $(INCLUDES)
+CXXALL=$(CXX) $(CXXFLAGS) $(CXXFLAGSB) $(CPPFLAGS) $(INCLUDES)
+LDALL=$(CXX) $(LDFLAGS) $(LIBS)
+CFLAGS=-O2 -W -Wall -fsigned-char
+CXXFLAGS=-O2 -W -Wall -fsigned-char
+CXXFLAGSB=
+ifndef GLOBFILES
+GLOBFILES=Makefile Makedep
+endif
+ALL +=test ps_tiny testfax sam2p jpegdump
+TARGETS =test ps_tiny testfax sam2p jpegdump
+test_DS=test_main.cpp in_tga.cpp in_pnm.cpp in_bmp.cpp in_gif.cpp out_gif.cpp
in_lbm.cpp in_xpm.cpp mapping.cpp minips.cpp encoder.cpp pts_lzw.c pts_fax.c
pts_defl.c error.cpp image.cpp gensio.cpp snprintf.c gensi.cpp
+test: $(GLOBFILES) test_main.o in_tga.o in_pnm.o in_bmp.o in_gif.o in_lbm.o
in_xpm.o mapping.o minips.o encoder.o pts_lzw.o pts_fax.o pts_defl.o error.o image.o
gensio.o snprintf.o gensi.o
+ $(LDALL) test_main.o in_tga.o in_pnm.o in_bmp.o in_gif.o out_gif.o in_lbm.o
in_xpm.o mapping.o minips.o encoder.o pts_lzw.o pts_fax.o pts_defl.o error.o image.o
gensio.o snprintf.o gensi.o -o test
+ @echo "Created executable file: test (size: `perl -e 'print -s "test"'`)."
+test.assert: $(GLOBFILES) $(test_DS)
+ $(CXD_assert) $(CXDFAL) $(test_DS) -o test.assert
+test.no: $(GLOBFILES) $(test_DS)
+ $(CXD_no) $(CXDFAL) $(test_DS) -o test.no
+test.yes: $(GLOBFILES) $(test_DS)
+ $(CXD_yes) $(CXDFAL) $(test_DS) -o test.yes
+test.checker: $(GLOBFILES) $(test_DS)
+ $(CXD_checker) $(CXDFAL) $(test_DS) -o test.checker
+ps_tiny_DS=ps_tiny.c
+ps_tiny: $(GLOBFILES) ps_tiny.o
+ $(LDALL) ps_tiny.o -o ps_tiny
+ @echo "Created executable file: ps_tiny (size: `perl -e 'print -s
"ps_tiny"'`)."
+ps_tiny.assert: $(GLOBFILES) $(ps_tiny_DS)
+ $(CXD_assert) $(CXDFAL) $(ps_tiny_DS) -o ps_tiny.assert
+ps_tiny.no: $(GLOBFILES) $(ps_tiny_DS)
+ $(CXD_no) $(CXDFAL) $(ps_tiny_DS) -o ps_tiny.no
+ps_tiny.yes: $(GLOBFILES) $(ps_tiny_DS)
+ $(CXD_yes) $(CXDFAL) $(ps_tiny_DS) -o ps_tiny.yes
+ps_tiny.checker: $(GLOBFILES) $(ps_tiny_DS)
+ $(CXD_checker) $(CXDFAL) $(ps_tiny_DS) -o ps_tiny.checker
+testfax_DS=testfax_main.c pts_fax.c
+testfax: $(GLOBFILES) testfax_main.o pts_fax.o
+ $(LDALL) testfax_main.o pts_fax.o -o testfax
+ @echo "Created executable file: testfax (size: `perl -e 'print -s
"testfax"'`)."
+testfax.assert: $(GLOBFILES) $(testfax_DS)
+ $(CXD_assert) $(CXDFAL) $(testfax_DS) -o testfax.assert
+testfax.no: $(GLOBFILES) $(testfax_DS)
+ $(CXD_no) $(CXDFAL) $(testfax_DS) -o testfax.no
+testfax.yes: $(GLOBFILES) $(testfax_DS)
+ $(CXD_yes) $(CXDFAL) $(testfax_DS) -o testfax.yes
+testfax.checker: $(GLOBFILES) $(testfax_DS)
+ $(CXD_checker) $(CXDFAL) $(testfax_DS) -o testfax.checker
+sam2p_DS=sam2p_main.cpp appliers.cpp crc32.c in_tga.cpp in_pnm.cpp in_bmp.cpp
in_gif.cpp out_gif.cpp in_lbm.cpp in_xpm.cpp mapping.cpp in_pcx.cpp in_jai.cpp
in_png.cpp in_jpeg.cpp in_tiff.cpp rule.cpp minips.cpp encoder.cpp pts_lzw.c pts_fax.c
pts_defl.c error.cpp image.cpp gensio.cpp snprintf.c gensi.cpp
+sam2p: $(GLOBFILES) sam2p_main.o appliers.o crc32.o in_tga.o in_pnm.o in_bmp.o
in_gif.o out_gif.o in_lbm.o in_xpm.o mapping.o in_pcx.o in_jai.o in_png.o in_jpeg.o
in_tiff.o rule.o minips.o encoder.o pts_lzw.o pts_fax.o pts_defl.o error.o image.o
gensio.o snprintf.o gensi.o
+ $(LDALL) sam2p_main.o appliers.o crc32.o in_tga.o in_pnm.o in_bmp.o in_gif.o
out_gif.o in_lbm.o in_xpm.o mapping.o in_pcx.o in_jai.o in_png.o in_jpeg.o in_tiff.o
rule.o minips.o encoder.o pts_lzw.o pts_fax.o pts_defl.o error.o image.o gensio.o
snprintf.o gensi.o -o sam2p
+ @echo "Created executable file: sam2p (size: `perl -e 'print -s "sam2p"'`)."
+sam2p.assert: $(GLOBFILES) $(sam2p_DS)
+ $(CXD_assert) $(CXDFAL) $(sam2p_DS) -o sam2p.assert
+sam2p.no: $(GLOBFILES) $(sam2p_DS)
+ $(CXD_no) $(CXDFAL) $(sam2p_DS) -o sam2p.no
+sam2p.yes: $(GLOBFILES) $(sam2p_DS)
+ $(CXD_yes) $(CXDFAL) $(sam2p_DS) -o sam2p.yes
+sam2p.checker: $(GLOBFILES) $(sam2p_DS)
+ $(CXD_checker) $(CXDFAL) $(sam2p_DS) -o sam2p.checker
+jpegdump_DS=jpegdump_main.cpp
+jpegdump: $(GLOBFILES) jpegdump_main.o
+ $(LDALL) jpegdump_main.o -o jpegdump
+ @echo "Created executable file: jpegdump (size: `perl -e 'print -s
"jpegdump"'`)."
+jpegdump.assert: $(GLOBFILES) $(jpegdump_DS)
+ $(CXD_assert) $(CXDFAL) $(jpegdump_DS) -o jpegdump.assert
+jpegdump.no: $(GLOBFILES) $(jpegdump_DS)
+ $(CXD_no) $(CXDFAL) $(jpegdump_DS) -o jpegdump.no
+jpegdump.yes: $(GLOBFILES) $(jpegdump_DS)
+ $(CXD_yes) $(CXDFAL) $(jpegdump_DS) -o jpegdump.yes
+jpegdump.checker: $(GLOBFILES) $(jpegdump_DS)
+ $(CXD_checker) $(CXDFAL) $(jpegdump_DS) -o jpegdump.checker
+
+image.o: $(GLOBFILES) image.cpp image.hpp config2.h \
+ config.h gensi.hpp \
+ error.hpp
+ $(CXXALL) -c image.cpp
+in_tiff.o: $(GLOBFILES) in_tiff.cpp image.hpp config2.h \
+ config.h gensi.hpp \
+ error.hpp \
+ gensio.hpp
+ $(CXXALL) -c in_tiff.cpp
+in_jpeg.o: $(GLOBFILES) in_jpeg.cpp image.hpp config2.h \
+ config.h gensi.hpp \
+ error.hpp \
+ gensio.hpp
+ $(CXXALL) -c in_jpeg.cpp
+testfax_main.o: $(GLOBFILES) testfax_main.c pts_fax.h config2.h \
+ config.h
+ $(CCALL) -c testfax_main.c
+appliers.o: $(GLOBFILES) appliers.cpp rule.hpp config2.h \
+ config.h gensio.hpp \
+ gensi.hpp \
+ image.hpp minips.hpp error.hpp encoder.hpp in_jai.hpp crc32.h
+ $(CXXALL) -c appliers.cpp
+test_main.o: $(GLOBFILES) test_main.cpp gensi.hpp config2.h \
+ config.h \
+ gensio.hpp \
+ image.hpp error.hpp encoder.hpp minips.hpp mapping.hpp
+ $(CXXALL) -c test_main.cpp
+in_pcx.o: $(GLOBFILES) in_pcx.cpp config2.h \
+ config.h image.hpp gensi.hpp \
+ error.hpp
+ $(CXXALL) -c in_pcx.cpp
+in_xpm.o: $(GLOBFILES) in_xpm.cpp image.hpp config2.h \
+ config.h gensi.hpp \
+ mapping.hpp error.hpp xpmc.h
+ $(CXXALL) -c in_xpm.cpp
+in_tga.o: $(GLOBFILES) in_tga.cpp image.hpp config2.h \
+ config.h gensi.hpp \
+ error.hpp \
+ input-tga.ci \
+ at_bitmap.h
+ $(CXXALL) -c in_tga.cpp
+pts_defl.o: $(GLOBFILES) pts_defl.c \
+ pts_defl.h
+ $(CCALL) -c pts_defl.c
+mapping.o: $(GLOBFILES) mapping.cpp mapping.hpp config2.h \
+ config.h gensi.hpp \
+ error.hpp
+ $(CXXALL) -c mapping.cpp
+c_lgcc3.o: $(GLOBFILES) c_lgcc3.cpp
+ $(CXXALL) -c c_lgcc3.cpp
+crc32.o: $(GLOBFILES) crc32.c crc32.h config2.h \
+ config.h
+ $(CCALL) -c crc32.c
+gensi.o: $(GLOBFILES) gensi.cpp gensi.hpp config2.h \
+ config.h
+ $(CXXALL) -c gensi.cpp
+gensio.o: $(GLOBFILES) gensio.cpp gensio.hpp config2.h \
+ config.h \
+ gensi.hpp \
+ error.hpp \
+ snprintf.h
+ $(CXXALL) -c gensio.cpp
+in_lbm.o: $(GLOBFILES) in_lbm.cpp image.hpp config2.h \
+ config.h gensi.hpp \
+ error.hpp
+ $(CXXALL) -c in_lbm.cpp
+pts_lzw.o: $(GLOBFILES) pts_lzw.c \
+ pts_lzw.h
+ $(CCALL) -c pts_lzw.c
+StdAfx.o: $(GLOBFILES) StdAfx.cpp stdafx.h
+ $(CXXALL) -c StdAfx.cpp
+in_png.o: $(GLOBFILES) in_png.cpp image.hpp config2.h \
+ config.h gensi.hpp \
+ error.hpp \
+ gensio.hpp
+ $(CXXALL) -c in_png.cpp
+in_bmp.o: $(GLOBFILES) in_bmp.cpp image.hpp config2.h \
+ config.h gensi.hpp \
+ error.hpp \
+ input-bmp.ci \
+ at_bitmap.h
+ $(CXXALL) -c in_bmp.cpp
+vcsam2p.o: $(GLOBFILES) vcsam2p.cpp config2.h \
+ config.h image.hpp gensi.hpp \
+ error.hpp \
+ main.hpp stdafx.h resource.h
+ $(CXXALL) -c vcsam2p.cpp
+sam2p_main.o: $(GLOBFILES) sam2p_main.cpp gensi.hpp config2.h \
+ config.h \
+ gensio.hpp \
+ image.hpp error.hpp encoder.hpp minips.hpp rule.hpp main.hpp \
+ bts2.tth
+ $(CXXALL) -c sam2p_main.cpp
+jpegdump_main.o: $(GLOBFILES) jpegdump_main.cpp config2.h \
+ config.h
+ $(CXXALL) -c jpegdump_main.cpp
+pts_fax.o: $(GLOBFILES) pts_fax.c pts_fax.h config2.h \
+ config.h
+ $(CCALL) -c pts_fax.c
+in_jai.o: $(GLOBFILES) in_jai.cpp image.hpp config2.h \
+ config.h gensi.hpp \
+ error.hpp \
+ in_jai.hpp gensio.hpp
+ $(CXXALL) -c in_jai.cpp
+in_pnm.o: $(GLOBFILES) in_pnm.cpp image.hpp config2.h \
+ config.h gensi.hpp \
+ error.hpp \
+ input-pnm.ci at_bitmap.h
+ $(CXXALL) -c in_pnm.cpp
+out_gif.o: $(GLOBFILES) out_gif.cpp image.hpp config2.h \
+ config.h gensi.hpp
+ $(CXXALL) -c out_gif.cpp
+minips.o: $(GLOBFILES) minips.cpp minips.hpp config2.h \
+ config.h gensi.hpp \
+ error.hpp \
+ gensio.hpp \
+ mapping.hpp
+ $(CXXALL) -c minips.cpp
+rule.o: $(GLOBFILES) rule.cpp rule.hpp config2.h \
+ config.h gensio.hpp \
+ gensi.hpp \
+ image.hpp minips.hpp error.hpp
+ $(CXXALL) -c rule.cpp
+ps_tiny.o: $(GLOBFILES) ps_tiny.c \
+ config2.h \
+ config.h
+ $(CCALL) -c ps_tiny.c
+cgif.o: $(GLOBFILES) cgif.c \
+ cgif.h
+ $(CCALL) -c cgif.c
+encoder.o: $(GLOBFILES) encoder.cpp encoder.hpp config2.h \
+ config.h gensio.hpp \
+ gensi.hpp \
+ error.hpp \
+ pts_defl.h pts_fax.h pts_lzw.h
+ $(CXXALL) -c encoder.cpp
+in_gif.o: $(GLOBFILES) in_gif.cpp config2.h \
+ config.h \
+ image.hpp gensi.hpp \
+ error.hpp
+ $(CXXALL) -c in_gif.cpp
+c_lgcc.o: $(GLOBFILES) c_lgcc.cpp
+ $(CXXALL) -c c_lgcc.cpp
+error.o: $(GLOBFILES) error.cpp error.hpp config2.h \
+ config.h gensi.hpp \
+ gensio.hpp
+ $(CXXALL) -c error.cpp
+snprintf.o: $(GLOBFILES) snprintf.c snprintf.h config2.h \
+ config.h
+ $(CCALL) -c snprintf.c
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sam2p/sam2p.spec
============================================================================
$ cvs diff -u -r1.5 -r1.6 sam2p.spec
--- openpkg-src/sam2p/sam2p.spec 8 Jul 2003 17:03:07 -0000 1.5
+++ openpkg-src/sam2p/sam2p.spec 11 Aug 2003 11:34:26 -0000 1.6
@@ -33,17 +33,20 @@
Group: Graphics
License: GPL
Version: 0.42
-Release: 20030206
+Release: 20030811
# list of sources
Source0: http://www.inf.bme.hu/~pts/sam2p-%{version}.tar.gz
+Source1: Makedep
Patch0: sam2p.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, ghostscript, jpeg, gzip, infozip, make,
gcc, perl, bash
-PreReq: OpenPKG, openpkg >= 20030103, ghostscript, jpeg, gzip, infozip
+BuildPreReq: OpenPKG, openpkg >= 20030103, ghostscript, make, gcc, perl, bash
+PreReq: OpenPKG, openpkg >= 20030103, ghostscript
+BuildPreReq: jpeg, gzip, infozip
+PreReq: jpeg, gzip, infozip
AutoReq: no
AutoReqProv: no
@@ -75,6 +78,11 @@
--enable-zip \
--enable-fax \
--enable-gif
+
+ # the ccdep script run by configure relies on specific behaviour
+ # of gcc2, as a workaround we provide a static file
+ cp %{SOURCE Makedep} .
+
%{l_make} %{l_mflags -O}
%install
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6123 -r1.6124 news.txt
--- openpkg-web/news.txt 11 Aug 2003 10:17:27 -0000 1.6123
+++ openpkg-web/news.txt 11 Aug 2003 11:34:24 -0000 1.6124
@@ -1,3 +1,4 @@
+11-Aug-2003: Upgraded package: P<sam2p-0.42-20030811>
11-Aug-2003: Upgraded package: P<scribus-1.0.1-20030811>
11-Aug-2003: Upgraded package: P<sophie-3.03-20030811>
11-Aug-2003: Upgraded package: P<xine-lib-1rc0a-20030811>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
