diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2013-10-20 18:57:28 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2013-10-20 18:57:28 +0000 |
| commit | 8fb066c1172583527c2331c086f006dc621435ef (patch) | |
| tree | 4f5e4371aab0b23655a843ffd8183cbc491dc79f | |
| parent | e6a83749afb645cc4c35ca6e3fde125f0a46c160 (diff) | |
| download | PROJ-8fb066c1172583527c2331c086f006dc621435ef.tar.gz PROJ-8fb066c1172583527c2331c086f006dc621435ef.zip | |
move projects.h to installed headers list (#220)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2396 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 6 | ||||
| -rw-r--r-- | src/makefile.vc | 1 |
4 files changed, 11 insertions, 4 deletions
@@ -1,5 +1,8 @@ 2013-10-20 Frank Warmerdam <warmerdam@pobox.com> + * src/Makefile.am: Given up on restricting access to projects.h, and + move it back into the list of files installed normally. + * configure.in: Add C_WFLAGS support, in particular use -Wdeclaration-after-statement to warn about code that won't work with MSVC (#224). diff --git a/src/Makefile.am b/src/Makefile.am index c8f18b74..22c2902c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,8 @@ EXTRA_PROGRAMS = multistresstest INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" \ -DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@ -include_HEADERS = proj_api.h org_proj4_Projections.h org_proj4_PJ.h geodesic.h +include_HEADERS = proj_api.h projects.h geodesic.h \ + org_proj4_Projections.h org_proj4_PJ.h EXTRA_DIST = makefile.vc proj.def @@ -27,7 +28,7 @@ lib_LTLIBRARIES = libproj.la libproj_la_LDFLAGS = -no-undefined -version-info 8:0:8 libproj_la_SOURCES = \ - projects.h pj_list.h \ + pj_list.h \ PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \ PJ_nsper.c PJ_nzmg.c PJ_ortho.c PJ_stere.c PJ_sterea.c \ PJ_aea.c PJ_bipc.c PJ_bonne.c PJ_eqdc.c PJ_isea.c \ diff --git a/src/Makefile.in b/src/Makefile.in index 0210d6a6..f220dbe2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -275,7 +275,9 @@ AM_CFLAGS = @C_WFLAGS@ INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" \ -DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@ -include_HEADERS = proj_api.h org_proj4_Projections.h org_proj4_PJ.h geodesic.h +include_HEADERS = proj_api.h projects.h geodesic.h \ + org_proj4_Projections.h org_proj4_PJ.h + EXTRA_DIST = makefile.vc proj.def proj_SOURCES = proj.c gen_cheb.c p_series.c cs2cs_SOURCES = cs2cs.c gen_cheb.c p_series.c @@ -290,7 +292,7 @@ multistresstest_LDADD = libproj.la -lpthread lib_LTLIBRARIES = libproj.la libproj_la_LDFLAGS = -no-undefined -version-info 8:0:8 libproj_la_SOURCES = \ - projects.h pj_list.h \ + pj_list.h \ PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \ PJ_nsper.c PJ_nzmg.c PJ_ortho.c PJ_stere.c PJ_sterea.c \ PJ_aea.c PJ_bipc.c PJ_bonne.c PJ_eqdc.c PJ_isea.c \ diff --git a/src/makefile.vc b/src/makefile.vc index a420c926..bcd47f58 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -136,5 +136,6 @@ install: all copy *.dll $(INSTDIR)\bin copy *.lib $(INSTDIR)\lib copy proj_api.h $(INSTDIR)\include + copy projects.h $(INSTDIR)\include copy geodesic.h $(INSTDIR)\include |