align Makevars

.gitignore

@@ -4,6 +4,7 @@
 .DS_Store
 .vscode/*
 *.o
+*.a
 src/*.a
 src/*.o
 src/*.so
@@ -30,3 +31,5 @@ inst/doc
 windows/
 tests/testthat/_snaps
 tests/testthat/testfiles
+src/cryptography/*.a
+src/cryptography/msoc/*.o

src/Makevars.in

@@ -1,17 +1,17 @@
 PKG_CPPFLAGS = @cflags@ -I. -I../inst/include/pugixml -Icryptography -Icryptography/msoc/include
-PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"` @libs@
+PKG_LIBS = -Lcryptography -lmsoc @libs@
 
-OBJECTS = cryptography/msoc/msocdll.o \
-          helper_functions.o \
-          load_workbook.o \
-          msoc.o \
-          pugi.o \
-          strings_xml.o \
-          styles_xml.o \
-          write_file.o \
-          RcppExports.o
+LIBMSOC = cryptography/msoc/msocdll.o
+
+STATLIB = cryptography/libmsoc.a
 
 all: clean
 
+all: $(SHLIB)
+$(SHLIB): $(STATLIB)
+
+$(STATLIB): $(LIBMSOC)
+	$(AR) rcs cryptography/libmsoc.a $(LIBMSOC)
+
 clean:
-	rm -f $(OBJECTS) $(SHLIB)
+	rm -f $(OBJECTS) $(SHLIB) $(STATLIB) $(LIBMSOC)

src/Makevars.win

@@ -1,10 +1,10 @@
 VERSION=1.1.1k
 PKG_CPPFLAGS= -I../windows/openssl-$(VERSION)/include -I. -I../inst/include/pugixml -Icryptography -Icryptography/msoc/include
-PKG_LIBS = -L. -lmsoc -L../windows/openssl-$(VERSION)/lib${R_ARCH}${CRT} -lssl -lcrypto -lws2_32 -lcrypt32
+PKG_LIBS = -Lcryptography -lmsoc -L../windows/openssl-$(VERSION)/lib${R_ARCH}${CRT} -lssl -lcrypto -lws2_32 -lcrypt32
 
 LIBMSOC = cryptography/msoc/msocdll.o
 
-STATLIB = libmsoc.a
+STATLIB = cryptography/libmsoc.a
 
 all: clean winlibs