← Back to branch summary

~ubuntu-branches/ubuntu/wily/proj/wily

~ubuntu-branches/ubuntu/wily/proj/wily

« back to all changes in this revision

Viewing changes to src/Makefile.am

Committer: Package Import Robot
Author(s): Francesco Paolo Lovergine, Jerome Villeneuve Larouche, Francesco Paolo Lovergine
Date: 2013-11-25 15:11:25 UTC
mfrom: (1.2.7)
Revision ID: package-import@ubuntu.com-20131125151125-mvcw144wvgep1hev

Tags: 4.8.0-1

[ Jerome Villeneuve Larouche ]
* New upstream release
* Modified libproj-dev.install to remove nad_list.h and projects.h
* Modified proj-bin.install to remove nad2nad
* Modified proj-bin.manpages to remove nad2nad man
* Added symbols for libproj0

[ Francesco Paolo Lovergine ]
* Properly merged with current git master and sid version 4.7.0-2.
* Removed proj transitional package and obsolete conflicts/replaces against
series 4.6 and older.

files added:
.pc

.pc/.quilt_patches

.pc/.quilt_series

.pc/.version

.pc/applied-patches

debian/libproj0.symbols

jniwrap/org/proj4/PJ.java

jniwrap/org/proj4/PJException.java

jniwrap/org/proj4/package-info.java

nad/CH

proj.pc.in

src/PJ_healpix.c

src/PJ_igh.c

src/PJ_isea.c

src/PJ_natearth.c

src/multistresstest.c

src/pj_apply_vgridshift.c

src/pj_ctx.c

src/pj_log.c

src/proj_etmerc.c

files removed:
man/man1/nad2nad.1

src/nad2nad.c

src/nad_list.h

files modified:
ChangeLog

Makefile.am

Makefile.in

NEWS

aclocal.m4

configure

configure.in

debian/changelog

debian/control

debian/libproj-dev.install

debian/proj-bin.install

debian/proj-bin.manpages

debian/rules

jniwrap/Makefile.in

jniwrap/README

jniwrap/build.xml

jniwrap/doxygen.cfg

jniwrap/org/Makefile.in

jniwrap/org/proj4/LatLong.java

jniwrap/org/proj4/Makefile.am

jniwrap/org/proj4/Makefile.in

jniwrap/org/proj4/Others.java

jniwrap/org/proj4/Proj4.java

jniwrap/org/proj4/Proj4Factory.java

jniwrap/org/proj4/ProjectionData.java

jniwrap/org/proj4/Projections.java

ltmain.sh *

man/Makefile.in

man/man1/Makefile.am

man/man1/Makefile.in

man/man3/Makefile.in

nad/IGNF

nad/Makefile.am

nad/Makefile.in

nad/epsg

nad/esri.extra

nad/other.extra

nad/proj_outIGNF.dist

nad/td_out.dist

nad/test27

nad/test83

nad/testIGNF

nad/testdatumfile

nad/testntv2

nad/testvarious

nad/tv_out.dist

nmake.opt

src/Makefile.am

src/Makefile.in

src/PJ_aea.c

src/PJ_aeqd.c

src/PJ_airy.c

src/PJ_aitoff.c

src/PJ_bipc.c

src/PJ_bonne.c

src/PJ_cass.c

src/PJ_cea.c

src/PJ_chamb.c

src/PJ_eck4.c

src/PJ_eqc.c

src/PJ_eqdc.c

src/PJ_fouc_s.c

src/PJ_geos.c

src/PJ_gn_sinu.c

src/PJ_goode.c

src/PJ_gstmerc.c

src/PJ_hammer.c

src/PJ_imw_p.c

src/PJ_krovak.c

src/PJ_labrd.c

src/PJ_lagrng.c

src/PJ_lcc.c

src/PJ_lcca.c

src/PJ_loxim.c

src/PJ_lsat.c

src/PJ_mbt_fps.c

src/PJ_merc.c

src/PJ_mod_ster.c

src/PJ_moll.c

src/PJ_nell.c

src/PJ_nsper.c

src/PJ_ob_tran.c

src/PJ_ocea.c

src/PJ_oea.c

src/PJ_omerc.c

src/PJ_putp2.c

src/PJ_putp4p.c

src/PJ_putp6.c

src/PJ_robin.c

src/PJ_rpoly.c

src/PJ_sconics.c

src/PJ_somerc.c

src/PJ_stere.c

src/PJ_sterea.c

src/PJ_sts.c

src/PJ_tmerc.c

src/PJ_tpeqd.c

src/PJ_urm5.c

src/PJ_urmfps.c

src/PJ_wag2.c

src/PJ_wag3.c

src/PJ_wink1.c

src/PJ_wink2.c

src/aasincos.c

src/biveval.c

src/cs2cs.c

src/dmstor.c

src/emess.h

src/geod.c

src/geod_set.c

src/jniproj.c

src/makefile.vc

src/mk_cheby.c

src/nad2bin.c

src/nad_init.c

src/pj_apply_gridshift.c

src/pj_auth.c

src/pj_datum_set.c

src/pj_datums.c

src/pj_ell_set.c

src/pj_factors.c

src/pj_fwd.c

src/pj_gauss.c

src/pj_gridinfo.c

src/pj_gridlist.c

src/pj_init.c

src/pj_initcache.c

src/pj_inv.c

src/pj_list.h

src/pj_malloc.c

src/pj_mlfn.c

src/pj_mutex.c

src/pj_open_lib.c

src/pj_param.c

src/pj_phi2.c

src/pj_pr_list.c

src/pj_release.c

src/pj_strerrno.c

src/pj_transform.c

src/pj_utils.c

src/proj.c

src/proj.def

src/proj_api.h

src/proj_mdist.c

src/proj_rouss.c

src/projects.h

src/vector1.c

Show diffs side-by-side

added added

removed removed

src/Makefile.am

1

bin_PROGRAMS = proj nad2nad nad2bin geod cs2cs

1

bin_PROGRAMS = proj nad2bin geod cs2cs

2

EXTRA_PROGRAMS = multistresstest

2

3

3

4

INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" \

4

5

-DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@

5

6

6

include_HEADERS = projects.h nad_list.h proj_api.h org_proj4_Projections.h

7

include_HEADERS = proj_api.h org_proj4_Projections.h

7

8

8

9

EXTRA_DIST = makefile.vc proj.def

9

10

10

11

proj_SOURCES = proj.c gen_cheb.c p_series.c

11

12

cs2cs_SOURCES = cs2cs.c gen_cheb.c p_series.c

12

nad2nad_SOURCES = nad2nad.c

13

13

nad2bin_SOURCES = nad2bin.c

14

14

geod_SOURCES = geod.c geod_set.c geod_for.c geod_inv.c geodesic.h

15

multistresstest_SOURCES = multistresstest.c

15

16

16

17

proj_LDADD = libproj.la

17

18

cs2cs_LDADD = libproj.la

18

nad2nad_LDADD = libproj.la

19

19

nad2bin_LDADD = libproj.la

20

20

geod_LDADD = libproj.la

21

multistresstest_LDADD = libproj.la -lpthread

21

22

22

23

lib_LTLIBRARIES = libproj.la

23

24

24

libproj_la_LDFLAGS = -no-undefined -version-info 6:6:6

25

libproj_la_LDFLAGS = -no-undefined -version-info 7:0:7

25

26

26

27

libproj_la_SOURCES = \

27

28

projects.h pj_list.h \

28

29

PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \

29

30

PJ_nsper.c PJ_nzmg.c PJ_ortho.c PJ_stere.c PJ_sterea.c \

30

PJ_aea.c PJ_bipc.c PJ_bonne.c PJ_eqdc.c \

31

PJ_aea.c PJ_bipc.c PJ_bonne.c PJ_eqdc.c PJ_isea.c \

31

32

PJ_imw_p.c PJ_krovak.c PJ_lcc.c PJ_poly.c \

32

33

PJ_rpoly.c PJ_sconics.c proj_rouss.c \

33

34

PJ_cass.c PJ_cc.c PJ_cea.c PJ_eqc.c \

38

39

PJ_chamb.c PJ_hammer.c PJ_lagrng.c PJ_larr.c \

39

40

PJ_lask.c PJ_nocol.c PJ_ob_tran.c PJ_oea.c \

40

41

PJ_tpeqd.c PJ_vandg.c PJ_vandg2.c PJ_vandg4.c \

41

PJ_wag7.c PJ_lcca.c PJ_geos.c \

42

PJ_wag7.c PJ_lcca.c PJ_geos.c proj_etmerc.c \

42

43

PJ_boggs.c PJ_collg.c PJ_crast.c PJ_denoy.c \

43

44

PJ_eck1.c PJ_eck2.c PJ_eck3.c PJ_eck4.c \

44

45

PJ_eck5.c PJ_fahey.c PJ_fouc_s.c PJ_gins8.c PJ_gstmerc.c \

45

PJ_gn_sinu.c PJ_goode.c PJ_hatano.c PJ_loxim.c \

46

PJ_gn_sinu.c PJ_goode.c PJ_igh.c PJ_hatano.c PJ_loxim.c \

46

47

PJ_mbt_fps.c PJ_mbtfpp.c PJ_mbtfpq.c PJ_moll.c \

47

48

PJ_nell.c PJ_nell_h.c PJ_putp2.c PJ_putp3.c \

48

49

PJ_putp4p.c PJ_putp5.c PJ_putp6.c PJ_robin.c \

54

55

pj_factors.c pj_fwd.c pj_init.c pj_inv.c \

55

56

pj_list.c pj_malloc.c pj_mlfn.c pj_msfn.c proj_mdist.c \

56

57

pj_open_lib.c pj_param.c pj_phi2.c pj_pr_list.c \

57

pj_qsfn.c pj_strerrno.c pj_tsfn.c pj_units.c \

58

pj_qsfn.c pj_strerrno.c pj_tsfn.c pj_units.c pj_ctx.c pj_log.c \

58

59

pj_zpoly1.c rtodms.c vector1.c pj_release.c pj_gauss.c \

60

PJ_healpix.c PJ_natearth.c \

59

61

\

60

62

nad_cvt.c nad_init.c nad_intr.c emess.c emess.h \

61

63

pj_apply_gridshift.c pj_datums.c pj_datum_set.c pj_transform.c \

62

64

geocent.c geocent.h pj_utils.c pj_gridinfo.c pj_gridlist.c \

63

jniproj.c pj_mutex.c pj_initcache.c

65

jniproj.c pj_mutex.c pj_initcache.c pj_apply_vgridshift.c

64

66

65

67

66

68

install-exec-local:

Older »