From 68547270c0329441a5573aa6991366c11a240488 Mon Sep 17 00:00:00 2001 From: Masanori Ogino Date: Thu, 7 Dec 2023 13:35:45 +0900 Subject: [PATCH] Build sj3rkcv Signed-off-by: Masanori Ogino --- Makefile | 12 ++++++++---- sj3rkcv/rk_conv.c => rk_conv.c | 0 sj3rkcv/sj3_rkcv.c => sj3_rkcv.c | 0 sj3rkcv/wc16_str.c => wc16_str.c | 0 4 files changed, 8 insertions(+), 4 deletions(-) rename sj3rkcv/rk_conv.c => rk_conv.c (100%) rename sj3rkcv/sj3_rkcv.c => sj3_rkcv.c (100%) rename sj3rkcv/wc16_str.c => wc16_str.c (100%) diff --git a/Makefile b/Makefile index 3a2f9e8..ea34bf1 100644 --- a/Makefile +++ b/Makefile @@ -31,13 +31,14 @@ VERSION := $(VMAJOR).$(VMINOR).$(VPATCH) LIBVER = 1 CFLAGS += -fPIC -CPPFLAGS += -I. -I./include +CPPFLAGS += -I. -I./include -I./sj3h LDFLAGS += -L. -SJ3LIB_OBJS = level1.o sj3lib.o string.o +SJ3LIB_OBJS = level1.o sj3lib.o string.o +SJ3RKCV_OBJS = rk_conv.o sj3_rkcv.o wc16_str.o SJ3STAT_OBJS = sj3stat.o -all: libsj3lib.a libsj3lib.so.$(LIBVER) sj3stat +all: libsj3lib.a libsj3lib.so.$(LIBVER) libsj3rkcv.a sj3stat install: all mkdir -p $(DESTDIR)$(BINDIR) @@ -50,12 +51,15 @@ install: all $(INSTALL_DATA) sj3lib.h $(DESTDIR)$(INCLUDEDIR) libsj3lib.a: $(SJ3LIB_OBJS) compats.o - $(AR) rs $@ $(SJ3LIB_OBJS) compats.o + $(AR) crs $@ $(SJ3LIB_OBJS) compats.o libsj3lib.so.$(LIBVER): $(SJ3LIB_OBJS) compats.o $(CC) -shared -o $@ $(SJ3LIB_OBJS) compats.o $(LDFLAGS) -Wl,${LINKER_SONAME},$@ $(LDLIBS) ln -sf $@ `basename $@ .$(LIBVER)` +libsj3rkcv.a: $(SJ3RKCV_OBJS) compats.o + $(AR) crs $@ $(SJ3RKCV_OBJS) compats.o + sj3stat: $(SJ3STAT_OBJS) libsj3lib.a compats.o $(CC) -static -o $@ $(SJ3STAT_OBJS) compats.o $(LDFLAGS) $(LDLIBS) -lsj3lib diff --git a/sj3rkcv/rk_conv.c b/rk_conv.c similarity index 100% rename from sj3rkcv/rk_conv.c rename to rk_conv.c diff --git a/sj3rkcv/sj3_rkcv.c b/sj3_rkcv.c similarity index 100% rename from sj3rkcv/sj3_rkcv.c rename to sj3_rkcv.c diff --git a/sj3rkcv/wc16_str.c b/wc16_str.c similarity index 100% rename from sj3rkcv/wc16_str.c rename to wc16_str.c