Changeset c6bbcdb for libcfa/prelude/Makefile.in

Timestamp:

Sep 25, 2018, 4:43:25 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

2725882

Parents:

6d44da1

Message:

Fixed shared library version number

File:

• libcfa/prelude/Makefile.in (modified) (2 diffs)

libcfa/prelude/Makefile.in

@@ -179 +179 @@
 CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
+CFA_VERSION = @CFA_VERSION@
 CFLAGS = @CFLAGS@
 CONFIGURATION = @CONFIGURATION@
@@ -302 +303 @@
 # put into lib for now
 cfalibdir = ${CFA_LIBDIR}
-<<<<<<< HEAD
-cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
-noinst_DATA = ../src/prelude.c
+cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
-=======
-cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
-AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
->>>>>>> master
 AM_CFAFLAGS = @CONFIG_CFAFLAGS@
 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa