summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Woelders <kim@woelders.dk>2021-12-02 18:09:12 +0100
committerKim Woelders <kim@woelders.dk>2021-12-04 06:55:21 +0100
commitf935f31bad765d83b003bfd713e551798af4da6f (patch)
tree7d96f914fd9564803d26481f8b988c7f4f9f9b85
parent8f28d7d7066a7358440553eb30cb5814e9a6c6ef (diff)
Simplify build wrt. asm files
-rw-r--r--src/lib/Makefile.am20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index ad65c0e..1fdedc5 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -53,9 +53,6 @@ AMD64_SRCS = \
53amd64_blend.S \ 53amd64_blend.S \
54amd64_blend_cmod.S 54amd64_blend_cmod.S
55 55
56MMX_OBJS = $(MMX_SRCS:.S=.lo)
57AMD64_OBJS = $(AMD64_SRCS:.S=.lo)
58
59EXTRA_DIST = $(MMX_SRCS) $(AMD64_SRCS) asm_loadimmq.S 56EXTRA_DIST = $(MMX_SRCS) $(AMD64_SRCS) asm_loadimmq.S
60 57
61MY_LIBS = $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm 58MY_LIBS = $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
@@ -76,18 +73,11 @@ MY_LIBS += $(CLOCK_LIBS)
76endif 73endif
77 74
78if BUILD_MMX 75if BUILD_MMX
79libImlib2_la_LIBADD = $(MMX_OBJS) $(MY_LIBS) 76libImlib2_la_SOURCES += $(MMX_SRCS)
80libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(MMX_OBJS)
81EXTRA_libImlib2_la_SOURCES = $(MMX_SRCS)
82else
83if BUILD_AMD64
84libImlib2_la_LIBADD = $(AMD64_OBJS) $(MY_LIBS)
85libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(AMD64_OBJS)
86EXTRA_libImlib2_la_SOURCES = $(AMD64_SRCS)
87else
88libImlib2_la_LIBADD = $(MY_LIBS)
89libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h
90endif 77endif
78if BUILD_AMD64
79libImlib2_la_SOURCES += $(AMD64_SRCS)
91endif 80endif
92libImlib2_la_LDFLAGS = -version-info @lt_version@
93 81
82libImlib2_la_LIBADD = $(MY_LIBS)
83libImlib2_la_LDFLAGS = -version-info @lt_version@