[med-svn] r22588 - in trunk/packages/snap/tags: . 2013-11-29-3/debian 2013-11-29-3/debian/patches
Sascha Steinbiss
satta at moszumanska.debian.org
Sun Jul 17 18:39:31 UTC 2016
Author: satta
Date: 2016-07-17 18:39:30 +0000 (Sun, 17 Jul 2016)
New Revision: 22588
Added:
trunk/packages/snap/tags/2013-11-29-3/
trunk/packages/snap/tags/2013-11-29-3/debian/changelog
trunk/packages/snap/tags/2013-11-29-3/debian/patches/build-with-gcc-6.patch
trunk/packages/snap/tags/2013-11-29-3/debian/patches/hardening.patch
Removed:
trunk/packages/snap/tags/2013-11-29-3/debian/changelog
trunk/packages/snap/tags/2013-11-29-3/debian/patches/build-with-gcc-6.patch
trunk/packages/snap/tags/2013-11-29-3/debian/patches/hardening.patch
Log:
[svn-buildpackage] Tagging snap 2013-11-29-3
Deleted: trunk/packages/snap/tags/2013-11-29-3/debian/changelog
===================================================================
--- trunk/packages/snap/trunk/debian/changelog 2016-07-17 10:36:46 UTC (rev 22581)
+++ trunk/packages/snap/tags/2013-11-29-3/debian/changelog 2016-07-17 18:39:30 UTC (rev 22588)
@@ -1,63 +0,0 @@
-snap (2013-11-29-2) unstable; urgency=medium
-
- [ Andreas Tille ]
- * Fix homepage
- * cme fix dpkg-control
- * Priority: optional
- * Better hardening
- * Lintian override for false positive of timestamped gzip files
-
- [ Sascha Steinbiss ]
- * Fix building with GCC6.
- Closes: #812011
-
- -- Andreas Tille <tille at debian.org> Tue, 03 May 2016 10:12:10 +0200
-
-snap (2013-11-29-1) unstable; urgency=medium
-
- * New upstream version
- Closes: #753849
- * adapted watch file
- * moved debian/upstream to debian/upstrem/metadata
- * d/copyright: Exclude binary files without source (from OSX)
- * cme fix dpkg-control
- * add autopkgtest
-
- -- Andreas Tille <tille at debian.org> Tue, 07 Oct 2014 13:31:52 +0200
-
-snap (2010-07-28-2) unstable; urgency=low
-
- * debian/upstream: Added citation information
- * debian/copyright: DEP5 issues
- * debian/README.Debian:
- - Removed information which is not intended for users
- - Added information about scripts which are not included into the
- package since some requriements are not yet fullfilled
- * debian/control:
- - cme fix dpkg-control
- - canonical Vcs fields
- * debhelper 9 (control+compat)
- * debian/patches/unused-but-set-variable.patch: Make sure package
- builds with hardening flags
- * debian/rules:
- - deleted useless comment
- - Work around self-made build system and save original files
- before configuration and restore these in clean target
- * debian/mans: create simple man pages by polishing help2man output
- * debian/bin/snap: wrapper to set environment variable ZOE to implement
- hint given in 00README installation instructions
- * debian/patches/hardening.patch: Propagate hardening options
-
- -- Andreas Tille <tille at debian.org> Fri, 25 Oct 2013 16:39:26 +0200
-
-snap (2010-07-28-1~lucid1) lucid; urgency=low
-
- * Building for Debian PPA
-
- -- Steffen Moeller <moeller at debian.org> Fri, 17 Jun 2011 00:52:13 +0200
-
-snap (2010-07-28-1) experimental; urgency=low
-
- * Crude initial release, lacking man pages (Closes: #630753).
-
- -- Steffen Moeller <moeller at debian.org> Fri, 17 Jun 2011 00:52:12 +0200
Copied: trunk/packages/snap/tags/2013-11-29-3/debian/changelog (from rev 22587, trunk/packages/snap/trunk/debian/changelog)
===================================================================
--- trunk/packages/snap/tags/2013-11-29-3/debian/changelog (rev 0)
+++ trunk/packages/snap/tags/2013-11-29-3/debian/changelog 2016-07-17 18:39:30 UTC (rev 22588)
@@ -0,0 +1,72 @@
+snap (2013-11-29-3) unstable; urgency=medium
+
+ * Team upload.
+ * add CPPFLAGS for full hardening.
+ * Fix building with GCC 6 by addressing a bug in zoeTools.c.
+ Closes: 831165.
+
+ -- Sascha Steinbiss <satta at debian.org> Sun, 17 Jul 2016 17:43:09 +0000
+
+snap (2013-11-29-2) unstable; urgency=medium
+
+ [ Andreas Tille ]
+ * Fix homepage
+ * cme fix dpkg-control
+ * Priority: optional
+ * Better hardening
+ * Lintian override for false positive of timestamped gzip files
+
+ [ Sascha Steinbiss ]
+ * Fix building with GCC6.
+ Closes: #812011
+
+ -- Andreas Tille <tille at debian.org> Tue, 03 May 2016 10:12:10 +0200
+
+snap (2013-11-29-1) unstable; urgency=medium
+
+ * New upstream version
+ Closes: #753849
+ * adapted watch file
+ * moved debian/upstream to debian/upstrem/metadata
+ * d/copyright: Exclude binary files without source (from OSX)
+ * cme fix dpkg-control
+ * add autopkgtest
+
+ -- Andreas Tille <tille at debian.org> Tue, 07 Oct 2014 13:31:52 +0200
+
+snap (2010-07-28-2) unstable; urgency=low
+
+ * debian/upstream: Added citation information
+ * debian/copyright: DEP5 issues
+ * debian/README.Debian:
+ - Removed information which is not intended for users
+ - Added information about scripts which are not included into the
+ package since some requriements are not yet fullfilled
+ * debian/control:
+ - cme fix dpkg-control
+ - canonical Vcs fields
+ * debhelper 9 (control+compat)
+ * debian/patches/unused-but-set-variable.patch: Make sure package
+ builds with hardening flags
+ * debian/rules:
+ - deleted useless comment
+ - Work around self-made build system and save original files
+ before configuration and restore these in clean target
+ * debian/mans: create simple man pages by polishing help2man output
+ * debian/bin/snap: wrapper to set environment variable ZOE to implement
+ hint given in 00README installation instructions
+ * debian/patches/hardening.patch: Propagate hardening options
+
+ -- Andreas Tille <tille at debian.org> Fri, 25 Oct 2013 16:39:26 +0200
+
+snap (2010-07-28-1~lucid1) lucid; urgency=low
+
+ * Building for Debian PPA
+
+ -- Steffen Moeller <moeller at debian.org> Fri, 17 Jun 2011 00:52:13 +0200
+
+snap (2010-07-28-1) experimental; urgency=low
+
+ * Crude initial release, lacking man pages (Closes: #630753).
+
+ -- Steffen Moeller <moeller at debian.org> Fri, 17 Jun 2011 00:52:12 +0200
Deleted: trunk/packages/snap/tags/2013-11-29-3/debian/patches/build-with-gcc-6.patch
===================================================================
--- trunk/packages/snap/trunk/debian/patches/build-with-gcc-6.patch 2016-07-17 10:36:46 UTC (rev 22581)
+++ trunk/packages/snap/tags/2013-11-29-3/debian/patches/build-with-gcc-6.patch 2016-07-17 18:39:30 UTC (rev 22588)
@@ -1,52 +0,0 @@
-Author: Sascha Steinbiss <satta at tetrinetsucht.de>
-Last-Update: Sat, 30 Apr 2016 17:48:14 +0100
-Bug-Debian: https://bugs.debian.org/812011
-Description: changing the (likely buggy) behaviour of the zoeHSPCmpQuery and
- zoeHSPCmpSbjct functions to do the correct comparisons. This fixes:
- error: self-comparison always evaluates to false [-Werror=tautological-compare]
-
---- a/Zoe/zoeAlignment.c
-+++ b/Zoe/zoeAlignment.c
-@@ -675,13 +675,13 @@
-
- int zoeHSPCmpQuery (const zoeHSP h1, const zoeHSP h2) {
- if (h1->q_start < h2->q_start && h1->q_end < h2->q_end) return -1;
-- else if (h1->q_start > h2->q_start && h2->q_end > h2->q_end) return 1;
-+ else if (h1->q_start > h2->q_start && h1->q_end > h2->q_end) return 1;
- else return 0;
- }
-
- int zoeHSPCmpSbjct (const zoeHSP h1, const zoeHSP h2) {
- if (h1->s_start < h2->s_start && h1->s_end < h2->s_end) return -1;
-- else if (h1->s_start > h2->s_start && h2->s_end > h2->s_end) return 1;
-+ else if (h1->s_start > h2->s_start && h1->s_end > h2->s_end) return 1;
- else return 0;
- }
-
-@@ -722,26 +722,6 @@
- return group;
- }
-
--/*
--
--zoeVec zoeChainHSPs (const zoeVec HSPs) {
-- int i;
-- zoeVec bestHSPs = NULL;
-- /* zoeVec qvec; */
-- /* zoeVec svec; */
--
-- for (i = 0; i < HSPs->size; i++) {
-- zoeWriteHSP(stdout, HSPs->elem[i]);
-- }
--
-- /* qvec = */ zoeGroupHSPs(HSPs, 'q');
-- /* svec = */ zoeGroupHSPs(HSPs, 's');
--
-- return bestHSPs;
--}
--
--*/
--
- void zoeDeleteScoreSystem (zoeScoreSystem s) {
- int i;
- for (i = 0; i < 22; i++) zoeFree(s->score[i]);
Copied: trunk/packages/snap/tags/2013-11-29-3/debian/patches/build-with-gcc-6.patch (from rev 22587, trunk/packages/snap/trunk/debian/patches/build-with-gcc-6.patch)
===================================================================
--- trunk/packages/snap/tags/2013-11-29-3/debian/patches/build-with-gcc-6.patch (rev 0)
+++ trunk/packages/snap/tags/2013-11-29-3/debian/patches/build-with-gcc-6.patch 2016-07-17 18:39:30 UTC (rev 22588)
@@ -0,0 +1,67 @@
+Author: Sascha Steinbiss <satta at tetrinetsucht.de>
+Last-Update: Sat, 30 Apr 2016 17:48:14 +0100
+Bug-Debian: https://bugs.debian.org/812011
+Description: changing the (likely buggy) behaviour of the zoeHSPCmpQuery and
+ zoeHSPCmpSbjct functions to do the correct comparisons. This fixes:
+ error: self-comparison always evaluates to false [-Werror=tautological-compare]
+
+--- a/Zoe/zoeAlignment.c
++++ b/Zoe/zoeAlignment.c
+@@ -675,13 +675,13 @@
+
+ int zoeHSPCmpQuery (const zoeHSP h1, const zoeHSP h2) {
+ if (h1->q_start < h2->q_start && h1->q_end < h2->q_end) return -1;
+- else if (h1->q_start > h2->q_start && h2->q_end > h2->q_end) return 1;
++ else if (h1->q_start > h2->q_start && h1->q_end > h2->q_end) return 1;
+ else return 0;
+ }
+
+ int zoeHSPCmpSbjct (const zoeHSP h1, const zoeHSP h2) {
+ if (h1->s_start < h2->s_start && h1->s_end < h2->s_end) return -1;
+- else if (h1->s_start > h2->s_start && h2->s_end > h2->s_end) return 1;
++ else if (h1->s_start > h2->s_start && h1->s_end > h2->s_end) return 1;
+ else return 0;
+ }
+
+@@ -722,26 +722,6 @@
+ return group;
+ }
+
+-/*
+-
+-zoeVec zoeChainHSPs (const zoeVec HSPs) {
+- int i;
+- zoeVec bestHSPs = NULL;
+- /* zoeVec qvec; */
+- /* zoeVec svec; */
+-
+- for (i = 0; i < HSPs->size; i++) {
+- zoeWriteHSP(stdout, HSPs->elem[i]);
+- }
+-
+- /* qvec = */ zoeGroupHSPs(HSPs, 'q');
+- /* svec = */ zoeGroupHSPs(HSPs, 's');
+-
+- return bestHSPs;
+-}
+-
+-*/
+-
+ void zoeDeleteScoreSystem (zoeScoreSystem s) {
+ int i;
+ for (i = 0; i < 22; i++) zoeFree(s->score[i]);
+--- a/Zoe/zoeTools.c
++++ b/Zoe/zoeTools.c
+@@ -149,10 +149,11 @@
+ do {
+ s[i++] = n % 10 + '0';
+ } while ((n /= 10) > 0);
+- if (sign < 0)
++ if (sign < 0) {
+ s[i++] = '-';
+ s[i] = '\0';
+ reverse_string(s);
++ }
+ }
+
+ /* coor_t */
Deleted: trunk/packages/snap/tags/2013-11-29-3/debian/patches/hardening.patch
===================================================================
--- trunk/packages/snap/trunk/debian/patches/hardening.patch 2016-07-17 10:36:46 UTC (rev 22581)
+++ trunk/packages/snap/tags/2013-11-29-3/debian/patches/hardening.patch 2016-07-17 18:39:30 UTC (rev 22588)
@@ -1,111 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-LastChanged: Fri, 25 Oct 2013 16:39:26 +0200
-Description: Propagate Hardening options
-
---- a/Makefile
-+++ b/Makefile
-@@ -2,6 +2,8 @@
- # Makefile for SNAP #
- ######################
-
-+export CFLAGS LDFLAGS
-+
- LIB = -lm
- INC = -IZoe
-
-@@ -58,19 +60,19 @@ default:
- make gcc
-
- $(APP): $(OBJ) $(OBJECTS)
-- $(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB)
-+ $(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB) $(LDFLAGS)
-
- $(APP2): $(OBJ2) $(OBJECTS)
-- $(CC) -o $(APP2) $(CFLAGS) $(OBJ2) $(OBJECTS) $(LIB)
-+ $(CC) -o $(APP2) $(CFLAGS) $(OBJ2) $(OBJECTS) $(LIB) $(LDFLAGS)
-
- $(APP3): $(OBJ3) $(OBJECTS)
-- $(CC) -o $(APP3) $(CFLAGS) $(OBJ3) $(OBJECTS) $(LIB)
-+ $(CC) -o $(APP3) $(CFLAGS) $(OBJ3) $(OBJECTS) $(LIB) $(LDFLAGS)
-
- $(APP4): $(OBJ4) $(OBJECTS)
-- $(CC) -o $(APP4) $(CFLAGS) $(OBJ4) $(OBJECTS) $(LIB)
-+ $(CC) -o $(APP4) $(CFLAGS) $(OBJ4) $(OBJECTS) $(LIB) $(LDFLAGS)
-
- $(APP5): $(OBJ5) $(OBJECTS)
-- $(CC) -o $(APP5) $(CFLAGS) $(OBJ5) $(OBJECTS) $(LIB)
-+ $(CC) -o $(APP5) $(CFLAGS) $(OBJ5) $(OBJECTS) $(LIB) $(LDFLAGS)
-
- clean:
- rm -f *.o $(APP) $(APP2) $(APP3) $(APP4) $(APP5)
-@@ -93,12 +95,12 @@ tar:
- #################
-
- gcc:
-- cd Zoe; make;
-- make $(APP) CC="gcc" CFLAGS="-O2 -Wall -Werror"
-- make $(APP2) CC="gcc" CFLAGS="-O2 -Wall -Werror"
-- make $(APP3) CC="gcc" CFLAGS="-O2 -Wall -Werror"
-- make $(APP4) CC="gcc" CFLAGS="-O2 -Wall -Werror"
-- make $(APP5) CC="gcc" CFLAGS="-O2 -Wall -Werror"
-+ cd Zoe; make CFLAGS="$(CFLAGS)";
-+ make $(APP) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
-+ make $(APP2) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
-+ make $(APP3) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
-+ make $(APP4) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
-+ make $(APP5) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
-
-
- ###################
---- a/Zoe/Makefile
-+++ b/Zoe/Makefile
-@@ -55,22 +55,22 @@ DATE = $(shell date +\%Y-\%m-\%d)
- ###########
-
- default:
-- make gcc
-+ make gcc CFLAGS="$(CFLAGS)"
-
- $(APP): $(OBJ) $(OBJECTS)
-- $(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB)
-+ $(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB) $(LDFLAGS)
-
- $(APP2): $(OBJ2) $(OBJECTS)
-- $(CC) -o $(APP2) $(CFLAGS) $(OBJ2) $(OBJECTS) $(LIB)
-+ $(CC) -o $(APP2) $(CFLAGS) $(OBJ2) $(OBJECTS) $(LIB) $(LDFLAGS)
-
- $(APP3): $(OBJ3) $(OBJECTS)
-- $(CC) -o $(APP3) $(CFLAGS) $(OBJ3) $(OBJECTS) $(LIB)
-+ $(CC) -o $(APP3) $(CFLAGS) $(OBJ3) $(OBJECTS) $(LIB) $(LDFLAGS)
-
- $(APP4): $(OBJ4) $(OBJECTS)
-- $(CC) -o $(APP4) $(CFLAGS) $(OBJ4) $(OBJECTS) $(LIB)
-+ $(CC) -o $(APP4) $(CFLAGS) $(OBJ4) $(OBJECTS) $(LIB) $(LDFLAGS)
-
- $(APP5): $(OBJ5) $(OBJECTS)
-- $(CC) -o $(APP5) $(CFLAGS) $(OBJ5) $(OBJECTS) $(LIB)
-+ $(CC) -o $(APP5) $(CFLAGS) $(OBJ5) $(OBJECTS) $(LIB) $(LDFLAGS)
-
- clean:
- rm -f *.o $(APP) $(APP2) $(APP3) $(APP4) $(APP5)
-@@ -92,14 +92,14 @@ tar:
- #################
-
- gcc:
-- make $(APP) CC="gcc" CFLAGS="-O2 -Wall -Werror"
-+ make $(APP) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
-
- all:
-- make $(APP) CC="gcc" CFLAGS="-O2 -Wall -Werror"
-- make $(APP2) CC="gcc" CFLAGS="-O2 -Wall -Werror"
-- make $(APP3) CC="gcc" CFLAGS="-O2 -Wall -Werror"
-- make $(APP4) CC="gcc" CFLAGS="-O2 -Wall -Werror"
-- make $(APP5) CC="gcc" CFLAGS="-O2 -Wall -Werror"
-+ make $(APP) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
-+ make $(APP2) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
-+ make $(APP3) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
-+ make $(APP4) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
-+ make $(APP5) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
-
-
- ###################
Copied: trunk/packages/snap/tags/2013-11-29-3/debian/patches/hardening.patch (from rev 22587, trunk/packages/snap/trunk/debian/patches/hardening.patch)
===================================================================
--- trunk/packages/snap/tags/2013-11-29-3/debian/patches/hardening.patch (rev 0)
+++ trunk/packages/snap/tags/2013-11-29-3/debian/patches/hardening.patch 2016-07-17 18:39:30 UTC (rev 22588)
@@ -0,0 +1,129 @@
+Author: Andreas Tille <tille at debian.org>
+LastChanged: Fri, 25 Oct 2013 16:39:26 +0200
+Description: Propagate Hardening options
+
+--- a/Makefile
++++ b/Makefile
+@@ -2,6 +2,8 @@
+ # Makefile for SNAP #
+ ######################
+
++export CFLAGS LDFLAGS
++
+ LIB = -lm
+ INC = -IZoe
+
+@@ -58,19 +60,19 @@
+ make gcc
+
+ $(APP): $(OBJ) $(OBJECTS)
+- $(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB)
++ $(CC) -o $(APP) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(OBJECTS) $(LIB) $(LDFLAGS)
+
+ $(APP2): $(OBJ2) $(OBJECTS)
+- $(CC) -o $(APP2) $(CFLAGS) $(OBJ2) $(OBJECTS) $(LIB)
++ $(CC) -o $(APP2) $(CFLAGS) $(CPPFLAGS) $(OBJ2) $(OBJECTS) $(LIB) $(LDFLAGS)
+
+ $(APP3): $(OBJ3) $(OBJECTS)
+- $(CC) -o $(APP3) $(CFLAGS) $(OBJ3) $(OBJECTS) $(LIB)
++ $(CC) -o $(APP3) $(CFLAGS) $(CPPFLAGS) $(OBJ3) $(OBJECTS) $(LIB) $(LDFLAGS)
+
+ $(APP4): $(OBJ4) $(OBJECTS)
+- $(CC) -o $(APP4) $(CFLAGS) $(OBJ4) $(OBJECTS) $(LIB)
++ $(CC) -o $(APP4) $(CFLAGS) $(CPPFLAGS) $(OBJ4) $(OBJECTS) $(LIB) $(LDFLAGS)
+
+ $(APP5): $(OBJ5) $(OBJECTS)
+- $(CC) -o $(APP5) $(CFLAGS) $(OBJ5) $(OBJECTS) $(LIB)
++ $(CC) -o $(APP5) $(CFLAGS) $(CPPFLAGS) $(OBJ5) $(OBJECTS) $(LIB) $(LDFLAGS)
+
+ clean:
+ rm -f *.o $(APP) $(APP2) $(APP3) $(APP4) $(APP5)
+@@ -93,12 +95,12 @@
+ #################
+
+ gcc:
+- cd Zoe; make;
+- make $(APP) CC="gcc" CFLAGS="-O2 -Wall -Werror"
+- make $(APP2) CC="gcc" CFLAGS="-O2 -Wall -Werror"
+- make $(APP3) CC="gcc" CFLAGS="-O2 -Wall -Werror"
+- make $(APP4) CC="gcc" CFLAGS="-O2 -Wall -Werror"
+- make $(APP5) CC="gcc" CFLAGS="-O2 -Wall -Werror"
++ cd Zoe; make CFLAGS="$(CFLAGS)";
++ make $(APP) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++ make $(APP2) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++ make $(APP3) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++ make $(APP4) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++ make $(APP5) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
+
+
+ ###################
+@@ -106,7 +108,7 @@
+ ###################
+
+ %.o: %.c
+- $(CC) $(CFLAGS) $(INC) -c -o $@ $<
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(INC) -c -o $@ $<
+
+ ################
+ # Dependancies #
+--- a/Zoe/Makefile
++++ b/Zoe/Makefile
+@@ -55,22 +55,22 @@
+ ###########
+
+ default:
+- make gcc
++ make gcc CFLAGS="$(CFLAGS)"
+
+ $(APP): $(OBJ) $(OBJECTS)
+- $(CC) -o $(APP) $(CFLAGS) $(OBJ) $(OBJECTS) $(LIB)
++ $(CC) -o $(APP) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(OBJECTS) $(LIB) $(LDFLAGS)
+
+ $(APP2): $(OBJ2) $(OBJECTS)
+- $(CC) -o $(APP2) $(CFLAGS) $(OBJ2) $(OBJECTS) $(LIB)
++ $(CC) -o $(APP2) $(CFLAGS) $(CPPFLAGS) $(OBJ2) $(OBJECTS) $(LIB) $(LDFLAGS)
+
+ $(APP3): $(OBJ3) $(OBJECTS)
+- $(CC) -o $(APP3) $(CFLAGS) $(OBJ3) $(OBJECTS) $(LIB)
++ $(CC) -o $(APP3) $(CFLAGS) $(CPPFLAGS) $(OBJ3) $(OBJECTS) $(LIB) $(LDFLAGS)
+
+ $(APP4): $(OBJ4) $(OBJECTS)
+- $(CC) -o $(APP4) $(CFLAGS) $(OBJ4) $(OBJECTS) $(LIB)
++ $(CC) -o $(APP4) $(CFLAGS) $(CPPFLAGS) $(OBJ4) $(OBJECTS) $(LIB) $(LDFLAGS)
+
+ $(APP5): $(OBJ5) $(OBJECTS)
+- $(CC) -o $(APP5) $(CFLAGS) $(OBJ5) $(OBJECTS) $(LIB)
++ $(CC) -o $(APP5) $(CFLAGS) $(CPPFLAGS) $(OBJ5) $(OBJECTS) $(LIB) $(LDFLAGS)
+
+ clean:
+ rm -f *.o $(APP) $(APP2) $(APP3) $(APP4) $(APP5)
+@@ -92,14 +92,14 @@
+ #################
+
+ gcc:
+- make $(APP) CC="gcc" CFLAGS="-O2 -Wall -Werror"
++ make $(APP) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
+
+ all:
+- make $(APP) CC="gcc" CFLAGS="-O2 -Wall -Werror"
+- make $(APP2) CC="gcc" CFLAGS="-O2 -Wall -Werror"
+- make $(APP3) CC="gcc" CFLAGS="-O2 -Wall -Werror"
+- make $(APP4) CC="gcc" CFLAGS="-O2 -Wall -Werror"
+- make $(APP5) CC="gcc" CFLAGS="-O2 -Wall -Werror"
++ make $(APP) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++ make $(APP2) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++ make $(APP3) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++ make $(APP4) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++ make $(APP5) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
+
+
+ ###################
+@@ -107,7 +107,7 @@
+ ###################
+
+ %.o: %.c
+- $(CC) $(CFLAGS) -c -o $@ $<
++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+
+ ################
+ # Dependancies #
More information about the debian-med-commit
mailing list