[SCM] FreeFem++ packaging branch, master, updated. debian/3.11-1-19-g141564a

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the master branch:
commit 2a8195ea73c21e8db1f4f9eb0d4f34b8fb62d857
Merge: 0754cc600f8ec6ef81eac4c1fef085d6da80cc35 7a7611ee55c844e2d266b1d6222ee68edbb57a3b
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Sat Jan 22 06:54:46 2011 +0200

    Merge commit 'upstream/3.12'
    
    Conflicts:
    	DOC/freefem++doc.pdf
    	src/medit/Makefile.am
    	src/medit/Makefile.in

diff --combined src/medit/Makefile.am
index 0907fc1,b49d804..8afa9df
--- a/src/medit/Makefile.am
+++ b/src/medit/Makefile.am
@@@ -23,13 -23,15 +23,16 @@@ BUILT_SOURCES=compil.dat
  compil.date: $(ffmedit_SOURCES)
  	echo "#define COMPIL " '"' `date` '(with ff++ $(VERSION))''"' > compil.date
  #.PHONY: compil.date
- # all-local: pinking.no-opt
- #
- # pinking.no-opt:picking.c
- # 	rm picking.$(OBJEXT)
- # 	$(MAKE) picking.o ffmedit CFLAGS="$(CNOFLAGS)"
- # 	touch pinking.no-opt
- # clean-local:
- # 	-rm pinking.no-opt
++
+ all-local: pinking.no-opt$(MEDITPROG)
+ 
+ pinking.no-optffmedit$(EXEEXT):picking.c
+ 	rm picking.$(OBJEXT)
+ 	$(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
+ 	touch pinking.no-optffmedit$(EXEEXT)
+ pinking.no-opt:picking.c
+ 	touch pinking.no-opt
+ clean-local:
+ 	-rm pinking.no-opt pinking.no-optffmedit$(EXEEXT)
  
  

-- 
FreeFem++ packaging