[med-svn] r8471 - trunk/packages/muscle/trunk/debian

[Charles Plessy]

Author: plessy
Date: 2011-11-08 06:45:46 +0000 (Tue, 08 Nov 2011)
New Revision: 8471

Modified:
   trunk/packages/muscle/trunk/debian/changelog
   trunk/packages/muscle/trunk/debian/rules
Log:
Build from within debian/rules.

This allows to set CXXFLAGS et al through CDBS.


Modified: trunk/packages/muscle/trunk/debian/changelog
===================================================================
--- trunk/packages/muscle/trunk/debian/changelog	2011-11-08 06:44:05 UTC (rev 8470)
+++ trunk/packages/muscle/trunk/debian/changelog	2011-11-08 06:45:46 UTC (rev 8471)
@@ -9,11 +9,11 @@
   * Repack usptream archive and implemented a get-orig-source target
     (debian/rules, debian/README.source, debian/copyright).
   * Use Debhelper 8 (debian/control, debian/compat).
+  * Build directly from debian/rules targets.
 
   [ David Paleino ]
   * debian/control:
     - bumped Standards-Version to 3.8.0
-      + enabled parallel building in debian/rules
     - removed myself from Uploaders
 
  -- David Paleino <d.paleino at gmail.com>  Wed, 11 Jun 2008 16:23:28 +0200

Modified: trunk/packages/muscle/trunk/debian/rules
===================================================================
--- trunk/packages/muscle/trunk/debian/rules	2011-11-08 06:44:05 UTC (rev 8470)
+++ trunk/packages/muscle/trunk/debian/rules	2011-11-08 06:45:46 UTC (rev 8471)
@@ -1,21 +1,22 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/class/makefile-vars.mk
 
+DEB_MAKE_BUILD_TARGET   :=
 
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-endif
-MAKEFLAGS += $(NUMJOBS)
+CPPNames = aligngivenpath aligngivenpathsw aligntwomsas aligntwoprofs aln alpha anchors bittraceback blosum62 blosumla clust cluster clwwt color cons diaglist diffobjscore diffpaths difftrees difftreese distcalc distfunc distpwkimura domuscle dosp dpreglist drawtree edgelist enumopts enumtostr estring fasta fasta2 fastclust fastdist fastdistjones fastdistkbit fastdistkmer fastdistmafft fastdistnuc fastscorepath2 finddiags finddiagsn glbalign glbalign352 glbaligndiag glbalignle glbalignsimple glbalignsp glbalignspn glbalignss glbalndimer globals globalslinux globalsosx globalsother globalswin32 gonnet henikoffweight henikoffweightpb html hydro intmath local main makerootmsa makerootmsab maketree mhack mpam200 msa msa2 msadistkimura msf muscle muscleout nucmx nwdasimple nwdasimple2 nwdasmall nwrec nwsmall objscore objscore2 objscoreda onexception options outweights pam200mafft params phy phy2 phy3 phy4 phyfromclust phyfromfile physeq phytofile posgap ppscore profdb profile profilefrommsa progalign progress progressivealign pwpath readmx realigndiffs realigndiffse refine refinehoriz refinesubfams refinetree refinetreee refinevert refinew savebest scoredist scoregaps scorehistory scorepp seq seqvect setblosumweights setgscweights setnewhandler spfast sptest stabilize subfam subfams sw termgaps textfile threewaywt tomhydro traceback tracebackopt tracebacksw treefrommsa typetostr upgma2 usage validateids vtml2 writescorefile
 
-DEB_MAKE_BUILD_TARGET   = all
-DEB_MAKE_INVOKE		+= -e $(MAKEFLAGS)
-DEB_MAKE_ENVVARS	= LDLIBS=-lm
+ObjNames = aligngivenpath.o aligngivenpathsw.o aligntwomsas.o aligntwoprofs.o aln.o alpha.o anchors.o bittraceback.o blosum62.o blosumla.o clust.o cluster.o clwwt.o color.o cons.o diaglist.o diffobjscore.o diffpaths.o difftrees.o difftreese.o distcalc.o distfunc.o distpwkimura.o domuscle.o dosp.o dpreglist.o drawtree.o edgelist.o enumopts.o enumtostr.o estring.o fasta.o fasta2.o fastclust.o fastdist.o fastdistjones.o fastdistkbit.o fastdistkmer.o fastdistmafft.o fastdistnuc.o fastscorepath2.o finddiags.o finddiagsn.o glbalign.o glbalign352.o glbaligndiag.o glbalignle.o glbalignsimple.o glbalignsp.o glbalignspn.o glbalignss.o glbalndimer.o globals.o globalslinux.o globalsosx.o globalsother.o globalswin32.o gonnet.o henikoffweight.o henikoffweightpb.o html.o hydro.o intmath.o local.o main.o makerootmsa.o makerootmsab.o maketree.o mhack.o mpam200.o msa.o msa2.o msadistkimura.o msf.o muscle.o muscleout.o nucmx.o nwdasimple.o nwdasimple2.o nwdasmall.o nwrec.o nwsmall.o objscore.o objscore2.o objscoreda.o onexception.o options.o outweights.o pam200mafft.o params.o phy.o phy2.o phy3.o phy4.o phyfromclust.o phyfromfile.o physeq.o phytofile.o posgap.o ppscore.o profdb.o profile.o profilefrommsa.o progalign.o progress.o progressivealign.o pwpath.o readmx.o realigndiffs.o realigndiffse.o refine.o refinehoriz.o refinesubfams.o refinetree.o refinetreee.o refinevert.o refinew.o savebest.o scoredist.o scoregaps.o scorehistory.o scorepp.o seq.o seqvect.o setblosumweights.o setgscweights.o setnewhandler.o spfast.o sptest.o stabilize.o subfam.o subfams.o sw.o termgaps.o textfile.o threewaywt.o tomhydro.o traceback.o tracebackopt.o tracebacksw.o treefrommsa.o typetostr.o upgma2.o usage.o validateids.o vtml2.o writescorefile.o
 
+%.o: $.cpp
+	$(CXX) -c -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $(LDLIBS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
+
+build/muscle:: $(ObjNames)
+	g++ $(LDLIBS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o muscle $(ObjNames)
+
 clean::
-	$(RM) *.o make.err make.out
-	$(RM) muscle
+	$(RM) *.o make.err make.out muscle
 
 SRC_TMP    := $(shell mktemp --tmpdir --directory muscle-build.XXXXXXXXXX)
 UP_TARBALL := $(SRC_TMP)/muscle$(DEB_UPSTREAM_VERSION)_src.tar.gz