Ignore:
Timestamp:
Sep 25, 2018, 4:43:25 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
2725882
Parents:
6d44da1
Message:

Fixed shared library version number

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/prelude/Makefile.in

    r6d44da1 rc6bbcdb  
    179179CFA_NAME = @CFA_NAME@
    180180CFA_PREFIX = @CFA_PREFIX@
     181CFA_VERSION = @CFA_VERSION@
    181182CFLAGS = @CFLAGS@
    182183CONFIGURATION = @CONFIGURATION@
     
    302303# put into lib for now
    303304cfalibdir = ${CFA_LIBDIR}
    304 <<<<<<< HEAD
    305 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
    306 noinst_DATA = ../src/prelude.c
     305cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
    307306AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
    308 =======
    309 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
    310 AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    311 >>>>>>> master
    312307AM_CFAFLAGS = @CONFIG_CFAFLAGS@
    313308MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
Note: See TracChangeset for help on using the changeset viewer.