IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Apr 9, 2009, 10:17:52 PM (17 years ago)
Author:
Paul Price
Message:

Making version information not dependent upon running configure, but on make.

Location:
trunk/psModules/src/config
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/config

    • Property svn:ignore

      •  

        old new  
        77pmErrorCodes.c
        88pmErrorCodes.h
         9pmVersionDefinitions.h

  • trunk/psModules/src/config/Makefile.am

    r23788 r23794  
    11noinst_LTLIBRARIES = libpsmodulesconfig.la
    22
     3if HAVE_SVNVERSION
     4PSMODULES_VERSION=`$(SVNVERSION) ../..`
     5else
     6PSMODULES_VERSION="UNKNOWN"
     7endif
     8
     9if HAVE_SVN
     10PSMODULES_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 }'`
     11PSMODULES_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
     12else
     13PSMODULES_BRANCH="UNKNOWN"
     14PSMODULES_SOURCE="UNKNOWN"
     15endif
     16
    317# Force recompilation of pmVersion.c, since it gets the version information
    4 pmVersion.c: FORCE
    5         touch pmVersion.c
     18pmVersion.c: pmVersionDefinitions.h
     19pmVersionDefinitions.h: pmVersionDefinitions.h.in FORCE
     20        -$(RM) pmVersionDefinitions.h
     21        $(SED) -e "s|@PSMODULES_VERSION@|\"$(PSMODULES_VERSION)\"|" -e "s|@PSMODULES_BRANCH@|\"$(PSMODULES_BRANCH)\"|" -e "s|@PSMODULES_SOURCE@|\"$(PSMODULES_SOURCE)\"|" pmVersionDefinitions.h.in > pmVersionDefinitions.h
    622FORCE: ;
    723
    8 libpsmodulesconfig_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS) -DPSMODULES_VERSION=$(PSMODULES_VERSION) -DPSMODULES_BRANCH=$(PSMODULES_BRANCH) -DPSMODULES_SOURCE=$(PSMODULES_SOURCE)
     24libpsmodulesconfig_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS)
    925libpsmodulesconfig_la_LDFLAGS  = -release $(PACKAGE_VERSION)
    1026libpsmodulesconfig_la_SOURCES  = \
    … …  
    3147
    3248# Error codes.
    33 BUILT_SOURCES = pmErrorCodes.h pmErrorCodes.c
    34 CLEANFILES = *~ pmErrorCodes.h pmErrorCodes.c
     49BUILT_SOURCES = pmErrorCodes.h pmErrorCodes.c pmVersionDefinitions.h
     50CLEANFILES = *~ pmErrorCodes.h pmErrorCodes.c pmVersionDefinitions.h
    3551
    3652pmErrorCodes.h : pmErrorCodes.dat pmErrorCodes.h.in
Note: See TracChangeset for help on using the changeset viewer.