summaryrefslogtreecommitdiff
path: root/main/lzo/Makefile.am
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-06-29 18:18:50 +0200
committerArne Schwabe <arne@rfc2549.org>2014-06-29 18:18:50 +0200
commit68e19d426ba6d9f048ebfdf337b93a85dc4d5b4c (patch)
treecb33b2698e3f665546a328882c7481b11f633428 /main/lzo/Makefile.am
parentd3aa9f835d7fd5f53d3a0da6778d46a7067bf074 (diff)
Update lzo version
--HG-- extra : rebase_source : 4310223035376c8ac1773fd03a43289aa96ce4f3
Diffstat (limited to 'main/lzo/Makefile.am')
-rw-r--r--main/lzo/Makefile.am38
1 files changed, 19 insertions, 19 deletions
diff --git a/main/lzo/Makefile.am b/main/lzo/Makefile.am
index 4b728046..246dc603 100644
--- a/main/lzo/Makefile.am
+++ b/main/lzo/Makefile.am
@@ -4,12 +4,12 @@
#
# This file is part of the LZO data compression library.
#
-# Copyright (C) 1996-2011 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer
# All Rights Reserved.
#
EXTRA_DIST =
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)
LDADD = src/liblzo2.la
lib_LTLIBRARIES =
noinst_PROGRAMS =
@@ -72,7 +72,7 @@ pkginclude_HEADERS = \
lib_LTLIBRARIES += src/liblzo2.la
-src_liblzo2_la_LDFLAGS = -version-info 2:0:0 $(AM_LDFLAGS)
+src_liblzo2_la_LDFLAGS = -version-info 2:0:0 -no-undefined $(AM_LDFLAGS)
src_liblzo2_la_SOURCES = \
src/lzo1.c src/lzo1_99.c src/lzo1a.c src/lzo1a_99.c src/lzo1b_1.c \
@@ -101,23 +101,23 @@ EXTRA_DIST += \
src/lzo1b_de.h src/lzo1b_r.ch src/lzo1b_sm.ch src/lzo1b_tm.ch \
src/lzo1c_cc.h src/lzo1f_d.ch src/lzo1x_c.ch src/lzo1x_d.ch \
src/lzo1x_oo.ch src/lzo2a_d.ch src/lzo_conf.h src/lzo_dict.h \
- src/lzo_dll.ch src/lzo_func.ch src/lzo_mchw.ch src/lzo_ptr.h src/lzo_swd.ch \
- src/miniacc.h src/stats1a.h src/stats1b.h src/stats1c.h
+ src/lzo_dll.ch src/lzo_func.h src/lzo_mchw.ch src/lzo_ptr.h \
+ src/lzo_supp.h src/lzo_swd.ch src/stats1a.h src/stats1b.h src/stats1c.h
LZO_ASM_SOURCES_i386_src_gas = \
- asm/i386/src_gas/lzo1c_s1.S asm/i386/src_gas/lzo1c_s2.S \
- asm/i386/src_gas/lzo1f_f1.S asm/i386/src_gas/lzo1f_f2.S \
- asm/i386/src_gas/lzo1x_f1.S asm/i386/src_gas/lzo1x_f2.S \
- asm/i386/src_gas/lzo1x_s1.S asm/i386/src_gas/lzo1x_s2.S \
- asm/i386/src_gas/lzo1y_f1.S asm/i386/src_gas/lzo1y_f2.S \
- asm/i386/src_gas/lzo1y_s1.S asm/i386/src_gas/lzo1y_s2.S
+ asm/i386/src_gas/lzo1c_s1.S \
+ asm/i386/src_gas/lzo1f_f1.S \
+ asm/i386/src_gas/lzo1x_f1.S \
+ asm/i386/src_gas/lzo1x_s1.S \
+ asm/i386/src_gas/lzo1y_f1.S \
+ asm/i386/src_gas/lzo1y_s1.S
LZO_ASM_OBJECTS_i386_obj_elf32 = \
- asm/i386/obj/elf32/lzo1c_s1.o asm/i386/obj/elf32/lzo1c_s2.o \
- asm/i386/obj/elf32/lzo1f_f1.o asm/i386/obj/elf32/lzo1f_f2.o \
- asm/i386/obj/elf32/lzo1x_f1.o asm/i386/obj/elf32/lzo1x_f2.o \
- asm/i386/obj/elf32/lzo1x_s1.o asm/i386/obj/elf32/lzo1x_s2.o \
- asm/i386/obj/elf32/lzo1y_f1.o asm/i386/obj/elf32/lzo1y_f2.o \
- asm/i386/obj/elf32/lzo1y_s1.o asm/i386/obj/elf32/lzo1y_s2.o
+ asm/i386/obj/elf32/lzo1c_s1.o \
+ asm/i386/obj/elf32/lzo1f_f1.o \
+ asm/i386/obj/elf32/lzo1x_f1.o \
+ asm/i386/obj/elf32/lzo1x_s1.o \
+ asm/i386/obj/elf32/lzo1y_f1.o \
+ asm/i386/obj/elf32/lzo1y_s1.o
if LZO_USE_ASM_i386_src_gas
LZO_ASM_SOURCES = $(LZO_ASM_SOURCES_i386_src_gas)
endif
@@ -186,9 +186,9 @@ noinst_PROGRAMS += minilzo/testmini
minilzo_testmini_SOURCES = minilzo/testmini.c minilzo/minilzo.c
minilzo_testmini_SHORTNAME = t
-minilzo_testmini_CPPFLAGS = -DMINILZO_HAVE_CONFIG_H=1
+minilzo_testmini_CPPFLAGS = $(AM_CPPFLAGS)
+minilzo_testmini_CPPFLAGS += -DMINILZO_HAVE_CONFIG_H=1
minilzo_testmini_CPPFLAGS += -I$(top_srcdir)/include/lzo
-minilzo_testmini_CPPFLAGS += $(AM_CPPFLAGS)
minilzo_testmini_LDADD =
EXTRA_DIST += minilzo/Makefile.minilzo minilzo/README.LZO minilzo/minilzo.h