IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38037 for trunk/psLib


Ignore:
Timestamp:
Mar 28, 2015, 7:12:19 AM (11 years ago)
Author:
eugene
Message:

install pslib-setsvnversion.pl; replace Makefile.am sed code with pslib-setsvnversion

Location:
trunk/psLib
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/psLib/Makefile.am

    r11493 r38037  
    11SUBDIRS = m4 $(SUBDIR)
    22
    3 bin_SCRIPTS = pslib-config 
     3bin_SCRIPTS = pslib-config
    44pkgconfigdir = $(libdir)/pkgconfig
    55pkgconfig_DATA= pslib.pc

  • trunk/psLib/etc/Makefile.am

    r10577 r38037  
    11BUILT_SOURCES = pslib.config
    22EXTRA_DIST = pslib.config.template
     3
     4bin_SCRIPTS = pslib-setsvnversion.pl
    35
    46# this is done instead of using autoconf to delay the expansion of datadir

  • trunk/psLib/pslib.pc.in

    r10528 r38037  
    77Description: Pan-STARRS Library
    88Version: @VERSION@
    9 Libs: -L${libdir} -lpslib
     9Libs: -L${libdir} -lpslib -lm
    1010Libs.private: @PSLIB_LIBS@
    1111Cflags: -I${includedir} @PSLIB_CFLAGS@

  • trunk/psLib/src/sys

    • Property svn:ignore

      •  

        old new  
        1212*.da
        1313psVersionDefinitions.h
         14psVersionDefinitions.h.tmp

  • trunk/psLib/src/sys/Makefile.am

    r23807 r38037  
    33noinst_LTLIBRARIES = libpslibsys.la
    44
    5 if HAVE_SVNVERSION
    6 PSLIB_VERSION=`$(SVNVERSION) ../..`
    7 else
    8 PSLIB_VERSION="UNKNOWN"
    9 endif
    10 
    11 if HAVE_SVN
    12 PSLIB_BRANCH=`$(SVN) info ../.. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    13 PSLIB_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    14 else
    15 PSLIB_BRANCH="UNKNOWN"
    16 PSLIB_SOURCE="UNKNOWN"
    17 endif
    18 
    195# Force recompilation of psConfigure.c, since it gets the version information
    206psConfigure.c: psVersionDefinitions.h
    217psVersionDefinitions.h: psVersionDefinitions.h.in FORCE
    22         -$(RM) psVersionDefinitions.h
    23         $(SED) -e "s|@PSLIB_VERSION@|\"$(PSLIB_VERSION)\"|" -e "s|@PSLIB_BRANCH@|\"$(PSLIB_BRANCH)\"|" -e "s|@PSLIB_SOURCE@|\"$(PSLIB_SOURCE)\"|" psVersionDefinitions.h.in > psVersionDefinitions.h
     8        ../../etc/pslib-setsvnversion.pl PSLIB psVersionDefinitions.h.in psVersionDefinitions.h
    249FORCE: ;
    2510
Note: See TracChangeset for help on using the changeset viewer.