From 1e111232e07b75622f1e34cb84dc0e9d7aed4e7f Mon Sep 17 00:00:00 2001
From: Jussi Lehtola <jussilehtola@fedoraproject.org>
Date: Sep 22 2009 14:30:05 +0000
Subject: Update patch, too.


---

diff --git a/healpix-2.11c-shlib.patch b/healpix-2.11c-shlib.patch
deleted file mode 100644
index 00de13f..0000000
--- a/healpix-2.11c-shlib.patch
+++ /dev/null
@@ -1,499 +0,0 @@
-diff -up Healpix_2.11c/src/cxx/alice/planck.make.orig Healpix_2.11c/src/cxx/alice/planck.make
---- Healpix_2.11c/src/cxx/alice/planck.make.orig	2009-01-08 18:19:58.000000000 +0200
-+++ Healpix_2.11c/src/cxx/alice/planck.make	2009-04-04 13:06:20.000000000 +0300
-@@ -20,28 +20,28 @@ test.o: alice_utils.h
- alice2.o: alice_usage.h OrthogonalSkyMap.h
- testOrthogonalSkyMap.o: OrthogonalSkyMap.h
- 
--generateTexture.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-+generateTexture.o: 
- generateTexture: generateTexture.o
- 	$(CXXL) $(CXXLFLAGS) -o $@ generateTexture.o  -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
-+	$(CXX_EXTRALIBS)
- 
--$(ALICE2_OBJ): libhealpix_cxx.a libcxxsupport.a libcfitsio.a
--alice2: $(ALICE2_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-+$(ALICE2_OBJ):
-+alice2: $(ALICE2_OBJ)
- 	$(CXXL) $(CXXLFLAGS) -o $@ $(ALICE2_OBJ) -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
-+	$(CXX_EXTRALIBS)
- 
--alice_test: $(TEST_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-+alice_test: $(TEST_OBJ) 
- 	$(CXXL) $(CXXLFLAGS) -o $@ $(TEST_OBJ) -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
-+	$(CXX_EXTRALIBS)	
- 
--testSoSSkyMap: $(TESTSOS_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-+testSoSSkyMap: $(TESTSOS_OBJ) 
- 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTSOS_OBJ) -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
-+	$(CXX_EXTRALIBS)		
- 
--testMollweideSkyMap: $(TESTMOL_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-+testMollweideSkyMap: $(TESTMOL_OBJ) 
- 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTMOL_OBJ) -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
-+	$(CXX_EXTRALIBS)	
- 	
--testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h  libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-+testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h
- 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTORTH_OBJ) -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
-+	$(CXX_EXTRALIBS)		
-diff -up Healpix_2.11c/src/cxx/config/rules.common.orig Healpix_2.11c/src/cxx/config/rules.common
---- Healpix_2.11c/src/cxx/config/rules.common.orig	2008-02-19 12:58:45.000000000 +0200
-+++ Healpix_2.11c/src/cxx/config/rules.common	2009-04-04 12:57:03.000000000 +0300
-@@ -1,10 +1,6 @@
- SRCROOT = $(LEVELS_SRC)
- BUILDDIR= $(SRCROOT)/build.$(HEALPIX_TARGET)
- PREFIX  = $(SRCROOT)/$(HEALPIX_TARGET)
--BINDIR	= $(PREFIX)/bin
--INCDIR	= $(PREFIX)/include
--LIBDIR	= $(PREFIX)/lib
--DOCDIR	= $(SRCROOT)/doc
- 
- # do not use any suffix rules
- .SUFFIXES:
-@@ -28,10 +24,10 @@ ACTIVE_SUBALL=$(addsuffix .all,$(ACTIVE_
- prep:
- 	@if [ ! -d $(PREFIX)   ]; then mkdir $(PREFIX)  ; fi
- 	@if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi
--	@if [ ! -d $(BINDIR)   ]; then mkdir $(BINDIR)  ; fi
--	@if [ ! -d $(LIBDIR)   ]; then mkdir $(LIBDIR)  ; fi
--	@if [ ! -d $(INCDIR)   ]; then mkdir $(INCDIR)  ; fi
--	@if [ ! -d $(DOCDIR)   ]; then mkdir $(DOCDIR)  ; fi
-+	@if [ ! -d $(DESTBIN)   ]; then mkdir $(DESTBIN)  ; fi
-+	@if [ ! -d $(DESTLIB)   ]; then mkdir $(DESTLIB)  ; fi
-+	@if [ ! -d $(DESTINC)   ]; then mkdir $(DESTINC)  ; fi
-+	@if [ ! -d $(DESTDOC)   ]; then mkdir $(DESTDOC)  ; fi
- 
- $(SUBCLEAN):
- 	@if [ -d $(BUILDDIR)/$(basename $@) ]; then \
-@@ -51,9 +47,9 @@ active_subdir_all: $(ACTIVE_SUBALL)
- subdir_clean: $(SUBCLEAN)
- 
- install:
--	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(INCDIR); fi
--	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(BINDIR); fi
--	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(LIBDIR); fi
-+	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(DESTINC); fi
-+	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(DESTBIN); fi
-+	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(DESTLIB); fi
- 
- install: $(BINARIES) $(LIBRARIES)
- $(BINARIES) $(LIBRARIES): $(OBJECTS)
-diff -up Healpix_2.11c/src/cxx/cxxsupport/planck.make.orig Healpix_2.11c/src/cxx/cxxsupport/planck.make
---- Healpix_2.11c/src/cxx/cxxsupport/planck.make.orig	2008-02-19 12:58:45.000000000 +0200
-+++ Healpix_2.11c/src/cxx/cxxsupport/planck.make	2009-04-04 13:09:33.000000000 +0300
-@@ -1,7 +1,6 @@
--TEMP1	= $(SRCROOT)/cxxsupport
- VPATH	= $(TEMP1) $(INCDIR)
- 
--LIBRARIES= libcxxsupport.a
-+LIBRARIES= libhealpix_cxxsupport.so
- 
- HEADERS=$(TEMP1)/cxxutils.h $(TEMP1)/arr.h $(TEMP1)/paramfile.h \
- 	$(TEMP1)/fitshandle.h $(TEMP1)/message_error.h $(TEMP1)/vec3.h \
-@@ -20,7 +19,7 @@ CXXUTILS_H := cxxutils.h $(MESSAGE_ERROR
- SIMPARAMS_H := simparams.h $(CXXUTILS_H)
- PARAMFILE_H := paramfile.h $(SIMPARAMS_H) $(CXXUTILS_H)
- ARR_H := arr.h $(CXXUTILS_H)
--FITSHANDLE_H := fitshandle.h fitsio.h $(ARR_H) $(DATATYPES_H)
-+FITSHANDLE_H := fitshandle.h $(ARR_H) $(DATATYPES_H)
- VEC3_H := vec3.h
- ROTMATRIX_H := rotmatrix.h $(CXXUTILS_H) $(VEC3_H)
- POINTING_H := pointing.h $(VEC3_H) $(CXXUTILS_H)
-@@ -43,3 +42,8 @@ trafos.o: $(TRAFOS_H) $(LSCONSTANTS_H)
- 
- libcxxsupport.a: $(SUPPORT_OBJ) $(HEADERS)
- 	$(ARCREATE) libcxxsupport.a $(SUPPORT_OBJ)
-+
-+.PHONY: libhealpix_cxxsupport.so
-+libhealpix_cxxsupport.so: $(SUPPORT_OBJ)
-+	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(SUPPORT_OBJ)
-+	cp -p $@ $(DESTLIB)/
-diff -up Healpix_2.11c/src/cxx/docsrc/planck.make.orig Healpix_2.11c/src/cxx/docsrc/planck.make
-diff -up Healpix_2.11c/src/cxx/Healpix_cxx/planck.make.orig Healpix_2.11c/src/cxx/Healpix_cxx/planck.make
---- Healpix_2.11c/src/cxx/Healpix_cxx/planck.make.orig	2006-12-04 21:31:45.000000000 +0200
-+++ Healpix_2.11c/src/cxx/Healpix_cxx/planck.make	2009-04-04 13:44:19.000000000 +0300
-@@ -1,21 +1,16 @@
--TEMP1	= $(SRCROOT)/Healpix_cxx
- VPATH	= $(TEMP1) $(LIBDIR)
- 
--LIBRARIES= libhealpix_cxx.a
-+LIBRARIES= libhealpix_cxx.so
- 
- BINARIES= syn_alm_cxx alm2map_cxx anafast_cxx map2tga udgrade_cxx \
- 	  hotspots_cxx calc_powspec median_filter hpxtest smoothing_cxx \
- 	  rotalm_cxx mult_alm
- 
--SPHERE_HEADERS= $(TEMP1)/alm.h $(TEMP1)/alm_fitsio.h \
--	$(TEMP1)/alm_powspec_tools.h $(TEMP1)/powspec.h \
--	$(TEMP1)/powspec_fitsio.h \
--	$(TEMP1)/ylmgen.h $(TEMP1)/alm_map_tools.h
--
--HEADERS= $(TEMP1)/healpix_base.h $(TEMP1)/healpix_map.h \
--	$(TEMP1)/healpix_map_fitsio.h $(TEMP1)/alm_healpix_tools.h \
--	$(TEMP1)/healpix_data_io.h $(TEMP1)/healpix_base2.h \
--	$(SPHERE_HEADERS)
-+SPHERE_HEADERS= alm.h alm_fitsio.h alm_powspec_tools.h powspec.h \
-+	powspec_fitsio.h ylmgen.h alm_map_tools.h
-+
-+HEADERS= healpix_base.h healpix_map.h healpix_map_fitsio.h alm_healpix_tools.h \
-+	healpix_data_io.h healpix_base2.h $(SPHERE_HEADERS)
- 
- include $(PARAMFILE)
- 
-@@ -25,81 +20,72 @@ SPHERE_OBJ= alm_fitsio.o powspec_fitsio.
- HEALPIX_OBJ= healpix_base.o healpix_map.o healpix_map_fitsio.o \
- 	alm_healpix_tools.o healpix_data_io.o healpix_base2.o $(SPHERE_OBJ)
- 
--healpix_base.o: healpix_base.h libcxxsupport.a
--healpix_base2.o: healpix_base.h healpix_base2.h libcxxsupport.a
--healpix_map.o: healpix_base.h healpix_map.h libcxxsupport.a
--healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h \
--	libcxxsupport.a
--alm_fitsio.o: alm_fitsio.h alm.h \
--	libcxxsupport.a
--healpix_data_io.o: healpix_data_io.h libcxxsupport.a
--powspec_fitsio.o: powspec.h libcxxsupport.a
--powspec.o: powspec.h libcxxsupport.a
-+healpix_base.o: healpix_base.h 
-+healpix_base2.o: healpix_base.h healpix_base2.h 
-+healpix_map.o: healpix_base.h healpix_map.h 
-+healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h 
-+alm_fitsio.o: alm_fitsio.h alm.h 
-+healpix_data_io.o: healpix_data_io.h
-+powspec_fitsio.o: powspec.h 
-+powspec.o: powspec.h
- alm_healpix_tools.o: healpix_base.h healpix_map.h alm.h \
--	ylmgen.h alm_healpix_tools.h alm_map_tools.h \
--	libfftpack.a libcxxsupport.a
--alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h libfftpack.a libcxxsupport.a
--alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h libcxxsupport.a
-+	ylmgen.h alm_healpix_tools.h alm_map_tools.h
-+alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h
-+alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h
- 
- libhealpix_cxx.a: $(HEALPIX_OBJ) $(HEADERS)
- 	$(ARCREATE) libhealpix_cxx.a $(HEALPIX_OBJ)
- 
--syn_alm_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-+.PHONY: libhealpix_cxx.so
-+libhealpix_cxx.so: $(HEALPIX_OBJ)
-+	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(HEALPIX_OBJ)
-+	cp -p $@ $(DESTLIB)/
-+
-+
-+syn_alm_cxx.o: libhealpix_cxx.so
- syn_alm_cxx: syn_alm_cxx.o
--	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o -lhealpix_cxx \
--	  -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
-+	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o $(CXX_EXTRALIBS)
- 
--alm2map_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
-+alm2map_cxx.o: libhealpix_cxx.so
- alm2map_cxx: alm2map_cxx.o
--	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
-+	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o $(CXX_EXTRALIBS)
- 
--anafast_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
-+anafast_cxx.o: libhealpix_cxx.so
- anafast_cxx: anafast_cxx.o
--	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
-+	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o $(CXX_EXTRALIBS)
- 
--map2tga.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-+map2tga.o: libhealpix_cxx.so
- map2tga: map2tga.o
--	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
-+	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o $(CXX_EXTRALIBS)
- 
--udgrade_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-+udgrade_cxx.o: libhealpix_cxx.so
- udgrade_cxx: udgrade_cxx.o
--	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
-+	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o $(CXX_EXTRALIBS)
- 
--hotspots_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-+hotspots_cxx.o: libhealpix_cxx.so
- hotspots_cxx: hotspots_cxx.o
--	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
-+	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o $(CXX_EXTRALIBS)
- 
--calc_powspec.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-+calc_powspec.o: libhealpix_cxx.so
- calc_powspec: calc_powspec.o
--	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
-+	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o $(CXX_EXTRALIBS)
- 
--median_filter.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-+median_filter.o: libhealpix_cxx.so
- median_filter: median_filter.o
--	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
-+	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o $(CXX_EXTRALIBS)
- 
--hpxtest.o: libhealpix_cxx.a libcxxsupport.a
-+hpxtest.o: libhealpix_cxx.so
- hpxtest: hpxtest.o
--	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
-+	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o $(CXX_EXTRALIBS)
- 
--smoothing_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
-+smoothing_cxx.o: libhealpix_cxx.so
- smoothing_cxx: smoothing_cxx.o
--	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
-+	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o $(CXX_EXTRALIBS)
- 
--rotalm_cxx.o: libcxxsupport.a libhealpix_cxx.a
-+rotalm_cxx.o: libhealpix_cxxsupport.so
- rotalm_cxx: rotalm_cxx.o
--	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
-+	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o $(CXX_EXTRALIBS)
- 
--mult_alm.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
-+mult_alm.o: libhealpix_cxx.so
- mult_alm: mult_alm.o
--	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o -lhealpix_cxx \
--	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
-+	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o $(CXX_EXTRALIBS)
-diff -up Healpix_2.11c/src/cxx/libcfitsio/planck.make.orig Healpix_2.11c/src/cxx/libcfitsio/planck.make
-diff -up Healpix_2.11c/src/cxx/libfftpack/planck.make.orig Healpix_2.11c/src/cxx/libfftpack/planck.make
---- Healpix_2.11c/src/cxx/libfftpack/planck.make.orig	2006-01-26 11:25:58.000000000 +0200
-+++ Healpix_2.11c/src/cxx/libfftpack/planck.make	2009-04-04 12:58:11.000000000 +0300
-@@ -1,9 +1,7 @@
--TEMP1	= $(SRCROOT)/libfftpack
- VPATH	= $(TEMP1) $(INCDIR)
- 
--LIBRARIES= libfftpack.a
-+LIBRARIES= libhealpix_fft.so
- 
--HEADERS= $(TEMP1)/ls_fft.h
- 
- include $(PARAMFILE)
- 
-@@ -16,3 +14,8 @@ ls_fft.o: ls_fft.h bluestein.h fftpack.h
- 
- libfftpack.a: $(FFTPACK_OBJ) $(HEADERS)
- 	$(ARCREATE) libfftpack.a $(FFTPACK_OBJ)
-+
-+libhealpix_fft.so: $(FFTPACK_OBJ)
-+	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(FFTPACK_OBJ)
-+	cp -p $@ $(DESTLIB)/
-+	cp -p *.h $(DESTINC)/
-diff -up Healpix_2.11c/src/cxx/test/runtest.sh.orig Healpix_2.11c/src/cxx/test/runtest.sh
---- Healpix_2.11c/src/cxx/test/runtest.sh.orig	2006-03-12 13:29:24.000000000 +0200
-+++ Healpix_2.11c/src/cxx/test/runtest.sh	2009-04-04 14:05:11.000000000 +0300
-@@ -1,16 +1,15 @@
- #!/bin/sh
- 
--BINPATH=../$HEALPIX_TARGET/bin
- 
--time $BINPATH/syn_alm_cxx syn_alm.par && \
--time $BINPATH/alm2map_cxx alm2map.par && \
--time $BINPATH/map2tga test.fits test.tga -bar -title "Synthesized Map" && \
--time $BINPATH/anafast_cxx anafast.par && \
--time $BINPATH/alm2map_cxx alm2map2.par && \
--time $BINPATH/map2tga test2.fits test2.tga -bar -title "Reconstructed Map" && \
--time $BINPATH/udgrade_cxx udgrade.par && \
--time $BINPATH/map2tga test3.fits test3.tga -bar -title "Downgraded Map" && \
--time $BINPATH/map2tga test3.fits test4.tga -bar -interpol -title "Downgraded, Interpolated Map" && \
--time $BINPATH/alm2map_cxx alm2map3.par && \
--time $BINPATH/map2tga test4.fits test5.tga -bar -title "Synthesized Map (Nside=317)" && \
-+time hp_syn_alm_cxx syn_alm.par && \
-+time hp_alm2map_cxx alm2map.par && \
-+time hp_map2tga test.fits test.tga -bar -title "Synthesized Map" && \
-+time hp_anafast_cxx anafast.par && \
-+time hp_alm2map_cxx alm2map2.par && \
-+time hp_map2tga test2.fits test2.tga -bar -title "Reconstructed Map" && \
-+time hp_udgrade_cxx udgrade.par && \
-+time hp_map2tga test3.fits test3.tga -bar -title "Downgraded Map" && \
-+time hp_map2tga test3.fits test4.tga -bar -interpol -title "Downgraded, Interpolated Map" && \
-+time hp_alm2map_cxx alm2map3.par && \
-+time hp_map2tga test4.fits test5.tga -bar -title "Synthesized Map (Nside=317)" && \
- xv test.tga test2.tga test3.tga test4.tga test5.tga
-diff -up Healpix_2.11c/src/f90/alteralm/Makefile.orig Healpix_2.11c/src/f90/alteralm/Makefile
---- Healpix_2.11c/src/f90/alteralm/Makefile.orig	2005-02-24 12:22:59.000000000 +0200
-+++ Healpix_2.11c/src/f90/alteralm/Makefile	2009-04-04 13:54:13.000000000 +0300
-@@ -11,5 +11,5 @@ inc	= alt_sub_inc.f90
- 
- default: $(exec)
- 
--$(exec): $(obj) $(LIBDIR)/libhealpix.a
--	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
-+$(exec): $(obj)
-+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/anafast/Makefile.orig Healpix_2.11c/src/f90/anafast/Makefile
---- Healpix_2.11c/src/f90/anafast/Makefile.orig	2005-02-16 06:55:38.000000000 +0200
-+++ Healpix_2.11c/src/f90/anafast/Makefile	2009-04-04 13:54:13.000000000 +0300
-@@ -11,5 +11,5 @@ inc     = ana_sub_inc.f90
- 
- default: $(exec)
- 
--$(exec): $(obj) $(LIBDIR)/libhealpix.a
--	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
-+$(exec): $(obj)
-+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/hotspot/Makefile.orig Healpix_2.11c/src/f90/hotspot/Makefile
---- Healpix_2.11c/src/f90/hotspot/Makefile.orig	2002-11-27 09:36:18.000000000 +0200
-+++ Healpix_2.11c/src/f90/hotspot/Makefile	2009-04-04 13:54:13.000000000 +0300
-@@ -31,5 +31,5 @@ obj 	= maxima_tools.o HotSpots.o
- 
- default: $(exec)
- 
--$(exec): $(obj) $(LIBDIR)/libhealpix.a
--	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
-+$(exec): $(obj)
-+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/lib/Makefile.orig Healpix_2.11c/src/f90/lib/Makefile
---- Healpix_2.11c/src/f90/lib/Makefile.orig	2005-01-28 09:33:25.000000000 +0200
-+++ Healpix_2.11c/src/f90/lib/Makefile	2009-04-04 13:54:44.000000000 +0300
-@@ -17,7 +17,7 @@ allobj	= $(libobj) $(gifobj) $(modobj)
- %.o: %.f90
- 	$(FC) $(FFLAGS) -c $< -o $@
- 
--default: libgif.a
-+default: libhealpix_gif.so
- 
- libgif.a: $(allobj)
- 	$(AR) libgif.a $(allobj)
-@@ -25,3 +25,16 @@ libgif.a: $(allobj)
- 	@for p in *.$(MOD); do \
- 	cp $$p $(INCDIR)/; \
- 	done
-+
-+# He's sick, he's sick, he's really really sick
-+# he's sick, he's sick, he's really really sick
-+# he's really really sick, he's really really sick
-+# he's sick, he's sick.
-+# -- Alice Cooper
-+.PHONY: libhealpix_gif.so
-+libhealpix_gif.so: $(allobj)
-+	$(FC) $(FFLAGS) -o $@ -shared $(allobj)
-+	cp -p $@ $(LIBDIR)/
-+	for p in *.$(MOD); do \
-+	cp $$p $(INCDIR)/; \
-+	done
-diff -up Healpix_2.11c/src/f90/map2gif/Makefile.orig Healpix_2.11c/src/f90/map2gif/Makefile
---- Healpix_2.11c/src/f90/map2gif/Makefile.orig	2003-02-17 13:06:10.000000000 +0200
-+++ Healpix_2.11c/src/f90/map2gif/Makefile	2009-04-04 13:55:21.000000000 +0300
-@@ -31,5 +31,5 @@ obj 	= map2gif.o
- 
- default: $(exec)
- 
--$(exec): $(obj) $(LIBDIR)/libhealpix.a $(LIBDIR)/libgif.a
--	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
-+$(exec): $(obj)
-+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lhealpix_gif -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/median_filter/Makefile.orig Healpix_2.11c/src/f90/median_filter/Makefile
---- Healpix_2.11c/src/f90/median_filter/Makefile.orig	2005-04-26 04:50:34.000000000 +0300
-+++ Healpix_2.11c/src/f90/median_filter/Makefile	2009-04-04 13:54:13.000000000 +0300
-@@ -11,5 +11,5 @@ inc     = med_sub_inc.f90
- 
- default: $(exec)
- 
--$(exec): $(obj) $(LIBDIR)/libhealpix.a
--	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
-+$(exec): $(obj)
-+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/mod/Makefile.orig Healpix_2.11c/src/f90/mod/Makefile
---- Healpix_2.11c/src/f90/mod/Makefile.orig	2008-01-29 18:39:20.000000000 +0200
-+++ Healpix_2.11c/src/f90/mod/Makefile	2009-04-04 13:54:13.000000000 +0300
-@@ -65,7 +65,7 @@ obj	= healpix_types.o extension.o misc_u
- 	esac
- 
- 
--default: libhealpix.a healpix_fft.o
-+default: libhealpix.so healpix_fft.o
- 
- libhealpix.a: $(obj) $(incpix) $(incalm) $(incfits) $(incudgrade)
- 	$(AR) libhealpix.a $(obj)
-@@ -74,6 +74,15 @@ libhealpix.a: $(obj) $(incpix) $(incalm)
- 	cp $$p $(INCDIR)/; \
- 	done
- 
-+# Umm, well, the copying. Curse you, crazy-minded scientists!
-+.PHONY: libhealpix.so
-+libhealpix.so: $(obj) $(incpix) $(incalm) $(incfits) $(incudgrade)
-+	$(FC) $(FFLAGS) -lcfitsio -o $@ -shared $(obj)
-+	cp -p $@ $(LIBDIR)/
-+	for p in *.$(MOD); do \
-+	cp $$p $(INCDIR)/; \
-+	done
-+
- alm_map_ss_inc.f90: alm_map_template.f90 gen_alm_code
- 	./gen_alm_code
- 
-diff -up Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.orig Healpix_2.11c/src/f90/ngsims_full_sky/Makefile
---- Healpix_2.11c/src/f90/ngsims_full_sky/Makefile.orig	2009-02-09 22:24:46.000000000 +0200
-+++ Healpix_2.11c/src/f90/ngsims_full_sky/Makefile	2009-04-04 13:54:13.000000000 +0300
-@@ -27,8 +27,8 @@ obj2 	= sky_sub.o  sub_ngpdf_powergauss.
- 
- default: $(exec1) $(exec2)
- 
--$(exec1): $(obj1) $(LIBDIR)/libhealpix.a
--	$(FC)  $(FFLAGS) -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
-+$(exec1): $(obj1)
-+	$(FC)  $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
- 
--$(exec2): $(obj2) $(LIBDIR)/libhealpix.a
--	$(FC)  $(FFLAGS) -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
-+$(exec2): $(obj2)
-+	$(FC)  $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/plmgen/Makefile.orig Healpix_2.11c/src/f90/plmgen/Makefile
---- Healpix_2.11c/src/f90/plmgen/Makefile.orig	2004-08-25 04:27:24.000000000 +0300
-+++ Healpix_2.11c/src/f90/plmgen/Makefile	2009-04-04 13:54:13.000000000 +0300
-@@ -10,5 +10,5 @@ obj 	= plmgen.o
- 
- default: $(exec)
- 
--$(exec): $(obj) $(LIBDIR)/libhealpix.a
--	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
-+$(exec): $(obj)
-+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/smoothing/Makefile.orig Healpix_2.11c/src/f90/smoothing/Makefile
---- Healpix_2.11c/src/f90/smoothing/Makefile.orig	2005-02-24 12:22:59.000000000 +0200
-+++ Healpix_2.11c/src/f90/smoothing/Makefile	2009-04-04 13:54:13.000000000 +0300
-@@ -11,5 +11,5 @@ inc 	= smo_sub_inc.f90
- 
- default: $(exec)
- 
--$(exec): $(obj) $(LIBDIR)/libhealpix.a
--	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
-+$(exec): $(obj)
-+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/synfast/Makefile.orig Healpix_2.11c/src/f90/synfast/Makefile
---- Healpix_2.11c/src/f90/synfast/Makefile.orig	2005-02-16 06:55:38.000000000 +0200
-+++ Healpix_2.11c/src/f90/synfast/Makefile	2009-04-04 13:54:13.000000000 +0300
-@@ -11,5 +11,5 @@ inc     = syn_sub_inc.f90
- 
- default: $(exec)
- 
--$(exec): $(obj) $(LIBDIR)/libhealpix.a
--	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
-+$(exec): $(obj)
-+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
-diff -up Healpix_2.11c/src/f90/ud_grade/Makefile.orig Healpix_2.11c/src/f90/ud_grade/Makefile
---- Healpix_2.11c/src/f90/ud_grade/Makefile.orig	2005-06-03 12:44:52.000000000 +0300
-+++ Healpix_2.11c/src/f90/ud_grade/Makefile	2009-04-04 13:54:13.000000000 +0300
-@@ -11,5 +11,5 @@ inc     = udg_sub_inc.f90
- 
- default: $(exec)
- 
--$(exec): $(obj) $(LIBDIR)/libhealpix.a
--	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
-+$(exec): $(obj)
-+	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff --git a/healpix-2.12a-shlib.patch b/healpix-2.12a-shlib.patch
new file mode 100644
index 0000000..8e541ed
--- /dev/null
+++ b/healpix-2.12a-shlib.patch
@@ -0,0 +1,474 @@
+diff -up Healpix_2.12a/src/cxx/alice/planck.make.shlib Healpix_2.12a/src/cxx/alice/planck.make
+--- Healpix_2.12a/src/cxx/alice/planck.make.shlib	2009-01-08 18:19:58.000000000 +0200
++++ Healpix_2.12a/src/cxx/alice/planck.make	2009-09-22 17:20:30.316676863 +0300
+@@ -20,28 +20,28 @@ test.o: alice_utils.h
+ alice2.o: alice_usage.h OrthogonalSkyMap.h
+ testOrthogonalSkyMap.o: OrthogonalSkyMap.h
+ 
+-generateTexture.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++generateTexture.o: 
+ generateTexture: generateTexture.o
+ 	$(CXXL) $(CXXLFLAGS) -o $@ generateTexture.o  -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXX_EXTRALIBS)
+ 
+-$(ALICE2_OBJ): libhealpix_cxx.a libcxxsupport.a libcfitsio.a
+-alice2: $(ALICE2_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++$(ALICE2_OBJ):
++alice2: $(ALICE2_OBJ)
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(ALICE2_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXX_EXTRALIBS)
+ 
+-alice_test: $(TEST_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++alice_test: $(TEST_OBJ) 
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TEST_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
++	$(CXX_EXTRALIBS)	
+ 
+-testSoSSkyMap: $(TESTSOS_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++testSoSSkyMap: $(TESTSOS_OBJ) 
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTSOS_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
++	$(CXX_EXTRALIBS)		
+ 
+-testMollweideSkyMap: $(TESTMOL_OBJ) libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++testMollweideSkyMap: $(TESTMOL_OBJ) 
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTMOL_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)	
++	$(CXX_EXTRALIBS)	
+ 	
+-testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h  libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++testOrthogonalSkyMap: $(TESTORTH_OBJ) OrthogonalSkyMap.h
+ 	$(CXXL) $(CXXLFLAGS) -o $@ $(TESTORTH_OBJ) -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)		
++	$(CXX_EXTRALIBS)		
+diff -up Healpix_2.12a/src/cxx/config/rules.common.shlib Healpix_2.12a/src/cxx/config/rules.common
+--- Healpix_2.12a/src/cxx/config/rules.common.shlib	2008-02-19 12:58:45.000000000 +0200
++++ Healpix_2.12a/src/cxx/config/rules.common	2009-09-22 17:20:30.316676863 +0300
+@@ -1,10 +1,6 @@
+ SRCROOT = $(LEVELS_SRC)
+ BUILDDIR= $(SRCROOT)/build.$(HEALPIX_TARGET)
+ PREFIX  = $(SRCROOT)/$(HEALPIX_TARGET)
+-BINDIR	= $(PREFIX)/bin
+-INCDIR	= $(PREFIX)/include
+-LIBDIR	= $(PREFIX)/lib
+-DOCDIR	= $(SRCROOT)/doc
+ 
+ # do not use any suffix rules
+ .SUFFIXES:
+@@ -28,10 +24,10 @@ ACTIVE_SUBALL=$(addsuffix .all,$(ACTIVE_
+ prep:
+ 	@if [ ! -d $(PREFIX)   ]; then mkdir $(PREFIX)  ; fi
+ 	@if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi
+-	@if [ ! -d $(BINDIR)   ]; then mkdir $(BINDIR)  ; fi
+-	@if [ ! -d $(LIBDIR)   ]; then mkdir $(LIBDIR)  ; fi
+-	@if [ ! -d $(INCDIR)   ]; then mkdir $(INCDIR)  ; fi
+-	@if [ ! -d $(DOCDIR)   ]; then mkdir $(DOCDIR)  ; fi
++	@if [ ! -d $(DESTBIN)   ]; then mkdir $(DESTBIN)  ; fi
++	@if [ ! -d $(DESTLIB)   ]; then mkdir $(DESTLIB)  ; fi
++	@if [ ! -d $(DESTINC)   ]; then mkdir $(DESTINC)  ; fi
++	@if [ ! -d $(DESTDOC)   ]; then mkdir $(DESTDOC)  ; fi
+ 
+ $(SUBCLEAN):
+ 	@if [ -d $(BUILDDIR)/$(basename $@) ]; then \
+@@ -51,9 +47,9 @@ active_subdir_all: $(ACTIVE_SUBALL)
+ subdir_clean: $(SUBCLEAN)
+ 
+ install:
+-	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(INCDIR); fi
+-	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(BINDIR); fi
+-	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(LIBDIR); fi
++	@if [ "$(HEADERS)"   ]; then cp -p $(HEADERS)   $(DESTINC); fi
++	@if [ "$(BINARIES)"  ]; then cp -p $(BINARIES)  $(DESTBIN); fi
++	@if [ "$(LIBRARIES)" ]; then cp -p $(LIBRARIES) $(DESTLIB); fi
+ 
+ install: $(BINARIES) $(LIBRARIES)
+ $(BINARIES) $(LIBRARIES): $(OBJECTS)
+diff -up Healpix_2.12a/src/cxx/cxxsupport/planck.make.shlib Healpix_2.12a/src/cxx/cxxsupport/planck.make
+--- Healpix_2.12a/src/cxx/cxxsupport/planck.make.shlib	2008-02-19 12:58:45.000000000 +0200
++++ Healpix_2.12a/src/cxx/cxxsupport/planck.make	2009-09-22 17:20:30.317676639 +0300
+@@ -1,7 +1,6 @@
+-TEMP1	= $(SRCROOT)/cxxsupport
+ VPATH	= $(TEMP1) $(INCDIR)
+ 
+-LIBRARIES= libcxxsupport.a
++LIBRARIES= libhealpix_cxxsupport.so
+ 
+ HEADERS=$(TEMP1)/cxxutils.h $(TEMP1)/arr.h $(TEMP1)/paramfile.h \
+ 	$(TEMP1)/fitshandle.h $(TEMP1)/message_error.h $(TEMP1)/vec3.h \
+@@ -20,7 +19,7 @@ CXXUTILS_H := cxxutils.h $(MESSAGE_ERROR
+ SIMPARAMS_H := simparams.h $(CXXUTILS_H)
+ PARAMFILE_H := paramfile.h $(SIMPARAMS_H) $(CXXUTILS_H)
+ ARR_H := arr.h $(CXXUTILS_H)
+-FITSHANDLE_H := fitshandle.h fitsio.h $(ARR_H) $(DATATYPES_H)
++FITSHANDLE_H := fitshandle.h $(ARR_H) $(DATATYPES_H)
+ VEC3_H := vec3.h
+ ROTMATRIX_H := rotmatrix.h $(CXXUTILS_H) $(VEC3_H)
+ POINTING_H := pointing.h $(VEC3_H) $(CXXUTILS_H)
+@@ -43,3 +42,8 @@ trafos.o: $(TRAFOS_H) $(LSCONSTANTS_H)
+ 
+ libcxxsupport.a: $(SUPPORT_OBJ) $(HEADERS)
+ 	$(ARCREATE) libcxxsupport.a $(SUPPORT_OBJ)
++
++.PHONY: libhealpix_cxxsupport.so
++libhealpix_cxxsupport.so: $(SUPPORT_OBJ)
++	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(SUPPORT_OBJ)
++	cp -p $@ $(DESTLIB)/
+diff -up Healpix_2.12a/src/cxx/Healpix_cxx/planck.make.shlib Healpix_2.12a/src/cxx/Healpix_cxx/planck.make
+--- Healpix_2.12a/src/cxx/Healpix_cxx/planck.make.shlib	2006-12-04 21:31:45.000000000 +0200
++++ Healpix_2.12a/src/cxx/Healpix_cxx/planck.make	2009-09-22 17:20:30.318676626 +0300
+@@ -1,21 +1,16 @@
+-TEMP1	= $(SRCROOT)/Healpix_cxx
+ VPATH	= $(TEMP1) $(LIBDIR)
+ 
+-LIBRARIES= libhealpix_cxx.a
++LIBRARIES= libhealpix_cxx.so
+ 
+ BINARIES= syn_alm_cxx alm2map_cxx anafast_cxx map2tga udgrade_cxx \
+ 	  hotspots_cxx calc_powspec median_filter hpxtest smoothing_cxx \
+ 	  rotalm_cxx mult_alm
+ 
+-SPHERE_HEADERS= $(TEMP1)/alm.h $(TEMP1)/alm_fitsio.h \
+-	$(TEMP1)/alm_powspec_tools.h $(TEMP1)/powspec.h \
+-	$(TEMP1)/powspec_fitsio.h \
+-	$(TEMP1)/ylmgen.h $(TEMP1)/alm_map_tools.h
+-
+-HEADERS= $(TEMP1)/healpix_base.h $(TEMP1)/healpix_map.h \
+-	$(TEMP1)/healpix_map_fitsio.h $(TEMP1)/alm_healpix_tools.h \
+-	$(TEMP1)/healpix_data_io.h $(TEMP1)/healpix_base2.h \
+-	$(SPHERE_HEADERS)
++SPHERE_HEADERS= alm.h alm_fitsio.h alm_powspec_tools.h powspec.h \
++	powspec_fitsio.h ylmgen.h alm_map_tools.h
++
++HEADERS= healpix_base.h healpix_map.h healpix_map_fitsio.h alm_healpix_tools.h \
++	healpix_data_io.h healpix_base2.h $(SPHERE_HEADERS)
+ 
+ include $(PARAMFILE)
+ 
+@@ -25,81 +20,72 @@ SPHERE_OBJ= alm_fitsio.o powspec_fitsio.
+ HEALPIX_OBJ= healpix_base.o healpix_map.o healpix_map_fitsio.o \
+ 	alm_healpix_tools.o healpix_data_io.o healpix_base2.o $(SPHERE_OBJ)
+ 
+-healpix_base.o: healpix_base.h libcxxsupport.a
+-healpix_base2.o: healpix_base.h healpix_base2.h libcxxsupport.a
+-healpix_map.o: healpix_base.h healpix_map.h libcxxsupport.a
+-healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h \
+-	libcxxsupport.a
+-alm_fitsio.o: alm_fitsio.h alm.h \
+-	libcxxsupport.a
+-healpix_data_io.o: healpix_data_io.h libcxxsupport.a
+-powspec_fitsio.o: powspec.h libcxxsupport.a
+-powspec.o: powspec.h libcxxsupport.a
++healpix_base.o: healpix_base.h 
++healpix_base2.o: healpix_base.h healpix_base2.h 
++healpix_map.o: healpix_base.h healpix_map.h 
++healpix_map_fitsio.o: healpix_map_fitsio.h healpix_map.h healpix_base.h 
++alm_fitsio.o: alm_fitsio.h alm.h 
++healpix_data_io.o: healpix_data_io.h
++powspec_fitsio.o: powspec.h 
++powspec.o: powspec.h
+ alm_healpix_tools.o: healpix_base.h healpix_map.h alm.h \
+-	ylmgen.h alm_healpix_tools.h alm_map_tools.h \
+-	libfftpack.a libcxxsupport.a
+-alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h libfftpack.a libcxxsupport.a
+-alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h libcxxsupport.a
++	ylmgen.h alm_healpix_tools.h alm_map_tools.h
++alm_map_tools.o: alm.h ylmgen.h alm_map_tools.h
++alm_powspec_tools.o: powspec.h alm.h alm_powspec_tools.h
+ 
+ libhealpix_cxx.a: $(HEALPIX_OBJ) $(HEADERS)
+ 	$(ARCREATE) libhealpix_cxx.a $(HEALPIX_OBJ)
+ 
+-syn_alm_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++.PHONY: libhealpix_cxx.so
++libhealpix_cxx.so: $(HEALPIX_OBJ)
++	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(HEALPIX_OBJ)
++	cp -p $@ $(DESTLIB)/
++
++
++syn_alm_cxx.o: libhealpix_cxx.so
+ syn_alm_cxx: syn_alm_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o -lhealpix_cxx \
+-	  -lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ syn_alm_cxx.o $(CXX_EXTRALIBS)
+ 
+-alm2map_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
++alm2map_cxx.o: libhealpix_cxx.so
+ alm2map_cxx: alm2map_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ alm2map_cxx.o $(CXX_EXTRALIBS)
+ 
+-anafast_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
++anafast_cxx.o: libhealpix_cxx.so
+ anafast_cxx: anafast_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ anafast_cxx.o $(CXX_EXTRALIBS)
+ 
+-map2tga.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++map2tga.o: libhealpix_cxx.so
+ map2tga: map2tga.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ map2tga.o $(CXX_EXTRALIBS)
+ 
+-udgrade_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++udgrade_cxx.o: libhealpix_cxx.so
+ udgrade_cxx: udgrade_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ udgrade_cxx.o $(CXX_EXTRALIBS)
+ 
+-hotspots_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++hotspots_cxx.o: libhealpix_cxx.so
+ hotspots_cxx: hotspots_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ hotspots_cxx.o $(CXX_EXTRALIBS)
+ 
+-calc_powspec.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++calc_powspec.o: libhealpix_cxx.so
+ calc_powspec: calc_powspec.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ calc_powspec.o $(CXX_EXTRALIBS)
+ 
+-median_filter.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++median_filter.o: libhealpix_cxx.so
+ median_filter: median_filter.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ median_filter.o $(CXX_EXTRALIBS)
+ 
+-hpxtest.o: libhealpix_cxx.a libcxxsupport.a
++hpxtest.o: libhealpix_cxx.so
+ hpxtest: hpxtest.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ hpxtest.o $(CXX_EXTRALIBS)
+ 
+-smoothing_cxx.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a libfftpack.a
++smoothing_cxx.o: libhealpix_cxx.so
+ smoothing_cxx: smoothing_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ smoothing_cxx.o $(CXX_EXTRALIBS)
+ 
+-rotalm_cxx.o: libcxxsupport.a libhealpix_cxx.a
++rotalm_cxx.o: libhealpix_cxxsupport.so
+ rotalm_cxx: rotalm_cxx.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ rotalm_cxx.o $(CXX_EXTRALIBS)
+ 
+-mult_alm.o: libhealpix_cxx.a libcxxsupport.a libcfitsio.a
++mult_alm.o: libhealpix_cxx.so
+ mult_alm: mult_alm.o
+-	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o -lhealpix_cxx \
+-	-lcxxsupport -lcfitsio -lfftpack $(CXX_EXTRALIBS)
++	$(CXXL) $(CXXLFLAGS) -o $@ mult_alm.o $(CXX_EXTRALIBS)
+diff -up Healpix_2.12a/src/cxx/libfftpack/planck.make.shlib Healpix_2.12a/src/cxx/libfftpack/planck.make
+--- Healpix_2.12a/src/cxx/libfftpack/planck.make.shlib	2006-01-26 11:25:58.000000000 +0200
++++ Healpix_2.12a/src/cxx/libfftpack/planck.make	2009-09-22 17:20:30.319676770 +0300
+@@ -1,9 +1,7 @@
+-TEMP1	= $(SRCROOT)/libfftpack
+ VPATH	= $(TEMP1) $(INCDIR)
+ 
+-LIBRARIES= libfftpack.a
++LIBRARIES= libhealpix_fft.so
+ 
+-HEADERS= $(TEMP1)/ls_fft.h
+ 
+ include $(PARAMFILE)
+ 
+@@ -16,3 +14,8 @@ ls_fft.o: ls_fft.h bluestein.h fftpack.h
+ 
+ libfftpack.a: $(FFTPACK_OBJ) $(HEADERS)
+ 	$(ARCREATE) libfftpack.a $(FFTPACK_OBJ)
++
++libhealpix_fft.so: $(FFTPACK_OBJ)
++	$(CXX) $(CXXFLAGS_NO_C) -o $@ -shared $(FFTPACK_OBJ)
++	cp -p $@ $(DESTLIB)/
++	cp -p *.h $(DESTINC)/
+diff -up Healpix_2.12a/src/f90/alteralm/Makefile.shlib Healpix_2.12a/src/f90/alteralm/Makefile
+--- Healpix_2.12a/src/f90/alteralm/Makefile.shlib	2005-02-24 12:22:59.000000000 +0200
++++ Healpix_2.12a/src/f90/alteralm/Makefile	2009-09-22 17:20:30.319676770 +0300
+@@ -11,5 +11,5 @@ inc	= alt_sub_inc.f90
+ 
+ default: $(exec)
+ 
+-$(exec): $(obj) $(LIBDIR)/libhealpix.a
+-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
++$(exec): $(obj)
++	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
+diff -up Healpix_2.12a/src/f90/anafast/Makefile.shlib Healpix_2.12a/src/f90/anafast/Makefile
+--- Healpix_2.12a/src/f90/anafast/Makefile.shlib	2005-02-16 06:55:38.000000000 +0200
++++ Healpix_2.12a/src/f90/anafast/Makefile	2009-09-22 17:20:30.319676770 +0300
+@@ -11,5 +11,5 @@ inc     = ana_sub_inc.f90
+ 
+ default: $(exec)
+ 
+-$(exec): $(obj) $(LIBDIR)/libhealpix.a
+-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
++$(exec): $(obj)
++	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
+diff -up Healpix_2.12a/src/f90/hotspot/Makefile.shlib Healpix_2.12a/src/f90/hotspot/Makefile
+--- Healpix_2.12a/src/f90/hotspot/Makefile.shlib	2009-06-26 21:06:41.000000000 +0300
++++ Healpix_2.12a/src/f90/hotspot/Makefile	2009-09-22 17:20:30.320676625 +0300
+@@ -31,8 +31,8 @@ obj 	= maxima_tools.o HotSpots.o
+ 
+ default: $(exec)
+ 
+-$(exec): $(obj) $(LIBDIR)/libhealpix.a
+-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
++$(exec): $(obj) $(LIBDIR)/libhealpix.so
++	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
+ 
+ # spell out dependencies to allow parallel compilation (make -j)
+ HotSpots.o: maxima_tools.o
+diff -up Healpix_2.12a/src/f90/lib/Makefile.shlib Healpix_2.12a/src/f90/lib/Makefile
+--- Healpix_2.12a/src/f90/lib/Makefile.shlib	2009-07-10 16:32:45.000000000 +0300
++++ Healpix_2.12a/src/f90/lib/Makefile	2009-09-22 17:20:30.320676625 +0300
+@@ -20,7 +20,7 @@ allobj	= $(libobj) $(gifobj) $(modobj)
+ %.o: %.c
+ 	$(CC) $(CFLAGS) -c $< -o $@
+ 
+-default: libhpxgif.a
++default: libhpxgif.so
+ 
+ libhpxgif.a: $(allobj)
+ 	$(AR) libhpxgif.a $(allobj)
+@@ -29,3 +29,16 @@ libhpxgif.a: $(allobj)
+ 	@for p in *.$(MOD); do \
+ 	cp $$p $(INCDIR)/; \
+ 	done
++
++# He's sick, he's sick, he's really really sick
++# he's sick, he's sick, he's really really sick
++# he's really really sick, he's really really sick
++# he's sick, he's sick.
++# -- Alice Cooper
++.PHONY: libhpxgif.so
++libhpxgif.so: $(allobj)
++	$(FC) $(FFLAGS) -o $@ -shared $(allobj)
++	cp -p $@ $(LIBDIR)/
++	for p in *.$(MOD); do \
++	cp $$p $(INCDIR)/; \
++	done
+diff -up Healpix_2.12a/src/f90/map2gif/Makefile.shlib Healpix_2.12a/src/f90/map2gif/Makefile
+--- Healpix_2.12a/src/f90/map2gif/Makefile.shlib	2009-07-10 16:32:45.000000000 +0300
++++ Healpix_2.12a/src/f90/map2gif/Makefile	2009-09-22 17:20:30.320676625 +0300
+@@ -31,5 +31,5 @@ obj 	= map2gif.o
+ 
+ default: $(exec)
+ 
+-$(exec): $(obj) $(LIBDIR)/libhealpix.a $(LIBDIR)/libhpxgif.a
+-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
++$(exec): $(obj) $(LIBDIR)/libhealpix.so $(LIBDIR)/libhpxgif.so
++	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -lhpxgif -o $(exec) $(obj) $(LDFLAGS)
+diff -up Healpix_2.12a/src/f90/median_filter/Makefile.shlib Healpix_2.12a/src/f90/median_filter/Makefile
+--- Healpix_2.12a/src/f90/median_filter/Makefile.shlib	2005-04-26 04:50:34.000000000 +0300
++++ Healpix_2.12a/src/f90/median_filter/Makefile	2009-09-22 17:20:30.321676604 +0300
+@@ -11,5 +11,5 @@ inc     = med_sub_inc.f90
+ 
+ default: $(exec)
+ 
+-$(exec): $(obj) $(LIBDIR)/libhealpix.a
+-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
++$(exec): $(obj)
++	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
+diff -up Healpix_2.12a/src/f90/mod/Makefile.shlib Healpix_2.12a/src/f90/mod/Makefile
+--- Healpix_2.12a/src/f90/mod/Makefile.shlib	2009-06-29 21:00:18.000000000 +0300
++++ Healpix_2.12a/src/f90/mod/Makefile	2009-09-22 17:20:30.321676604 +0300
+@@ -33,7 +33,7 @@ obj7  = healpix_modules.o
+ 
+ obj   = $(obj0) $(obj1) $(obj2) $(obj3) $(obj4) $(obj5) $(obj6) $(obj7)
+ 
+-default: libhealpix.a 
++default: libhealpix.so
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) -c -o $@ $<
+@@ -62,6 +62,17 @@ libhealpix.a: $(obj) $(incpix) $(incalm)
+ 	cp $$p $(INCDIR)/; \
+ 	done
+ 
++# Umm, well, the copying. Curse you, crazy-minded scientists!
++.PHONY: libhealpix.so
++libhealpix.so: $(obj) $(incpix) $(incalm) $(incfits) $(incudgrade)
++	$(FC) $(FFLAGS) -lcfitsio -o $@ -shared $(obj)
++	cp -p $@ $(LIBDIR)/
++	for p in *.$(MOD); do \
++	cp $$p $(INCDIR)/; \
++	done
++
++
++
+ alm_map_ss_inc.f90: alm_map_template.f90 gen_alm_code
+ 	@./gen_alm_code
+ 
+diff -up Healpix_2.12a/src/f90/ngsims_full_sky/Makefile.shlib Healpix_2.12a/src/f90/ngsims_full_sky/Makefile
+--- Healpix_2.12a/src/f90/ngsims_full_sky/Makefile.shlib	2009-06-26 21:06:41.000000000 +0300
++++ Healpix_2.12a/src/f90/ngsims_full_sky/Makefile	2009-09-22 17:27:00.892676992 +0300
+@@ -29,11 +29,11 @@ obj2 	= $(subs)  sky_ng_sim_bin.o
+ 
+ default: $(exec1) $(exec2)
+ 
+-$(exec1): $(obj1) $(LIBDIR)/libhealpix.a
+-	$(FC)  $(FFLAGS) -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
++$(exec1): $(obj1) $(LIBDIR)/libhealpix.so
++	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec1) $(obj1) $(PGLIBS) $(LDFLAGS)
+ 
+-$(exec2): $(obj2) $(LIBDIR)/libhealpix.a
+-	$(FC)  $(FFLAGS) -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
++$(exec2): $(obj2) $(LIBDIR)/libhealpix.so
++	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec2) $(obj2) $(PGLIBS) $(LDFLAGS)
+ 
+ # spell out dependencies to allow parallel compilation (make -j)
+ sub_ngpdf_powergauss.o: sky_sub.o
+diff -up Healpix_2.12a/src/f90/plmgen/Makefile.shlib Healpix_2.12a/src/f90/plmgen/Makefile
+--- Healpix_2.12a/src/f90/plmgen/Makefile.shlib	2004-08-25 04:27:24.000000000 +0300
++++ Healpix_2.12a/src/f90/plmgen/Makefile	2009-09-22 17:20:30.322676602 +0300
+@@ -10,5 +10,5 @@ obj 	= plmgen.o
+ 
+ default: $(exec)
+ 
+-$(exec): $(obj) $(LIBDIR)/libhealpix.a
+-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
++$(exec): $(obj)
++	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
+diff -up Healpix_2.12a/src/f90/smoothing/Makefile.shlib Healpix_2.12a/src/f90/smoothing/Makefile
+--- Healpix_2.12a/src/f90/smoothing/Makefile.shlib	2005-02-24 12:22:59.000000000 +0200
++++ Healpix_2.12a/src/f90/smoothing/Makefile	2009-09-22 17:20:30.322676602 +0300
+@@ -11,5 +11,5 @@ inc 	= smo_sub_inc.f90
+ 
+ default: $(exec)
+ 
+-$(exec): $(obj) $(LIBDIR)/libhealpix.a
+-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
++$(exec): $(obj)
++	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
+diff -up Healpix_2.12a/src/f90/synfast/Makefile.shlib Healpix_2.12a/src/f90/synfast/Makefile
+--- Healpix_2.12a/src/f90/synfast/Makefile.shlib	2005-02-16 06:55:38.000000000 +0200
++++ Healpix_2.12a/src/f90/synfast/Makefile	2009-09-22 17:20:30.323676731 +0300
+@@ -11,5 +11,5 @@ inc     = syn_sub_inc.f90
+ 
+ default: $(exec)
+ 
+-$(exec): $(obj) $(LIBDIR)/libhealpix.a
+-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
++$(exec): $(obj)
++	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
+diff -up Healpix_2.12a/src/f90/ud_grade/Makefile.shlib Healpix_2.12a/src/f90/ud_grade/Makefile
+--- Healpix_2.12a/src/f90/ud_grade/Makefile.shlib	2005-06-03 12:44:52.000000000 +0300
++++ Healpix_2.12a/src/f90/ud_grade/Makefile	2009-09-22 17:20:30.323676731 +0300
+@@ -11,5 +11,5 @@ inc     = udg_sub_inc.f90
+ 
+ default: $(exec)
+ 
+-$(exec): $(obj) $(LIBDIR)/libhealpix.a
+-	$(FC) $(FFLAGS) -o $(exec) $(obj) $(LDFLAGS)
++$(exec): $(obj)
++	$(FC) $(FFLAGS) -L$(LIBDIR) -lhealpix -o $(exec) $(obj) $(LDFLAGS)
diff --git a/healpix.spec b/healpix.spec
index e004ce5..e97bfa9 100644
--- a/healpix.spec
+++ b/healpix.spec
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://healpix.jpl.nasa.gov/
 Source0:        http://downloads.sourceforge.net/project/healpix/Healpix_2.12a/Healpix_2.12a_2009Aug06a.tar.gz
 Source1:        healpix-f90test.sh
-Patch0:         healpix-2.11c-shlib.patch
+Patch0:         healpix-2.12a-shlib.patch
 Patch1:         healpix-2.11c-gcc44.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,7 +107,7 @@ rm test/README
 install -p -m 755 %{SOURCE1} runtest.sh
 
 # Remove patch backup from doc
-rm src/cxx/test/*.shlib
+rm -f src/cxx/test/*.shlib
 
 %build
 # Generic stuff
@@ -260,7 +260,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hp_synfast
 %{_bindir}/hp_ud_grade
 %{_libdir}/libhealpix.so
-%{_libdir}/libhealpix_gif.so
+%{_libdir}/libhpxgif.so
 
 
 %files devel