From 81bfed9bda9219cc618f6a5c0f9e02b579bfbc9d Mon Sep 17 00:00:00 2001 From: "J. Derek Tucker" Date: Mon, 15 Jul 2024 20:51:55 -0600 Subject: [PATCH] cleanup --- src/Makevars.win | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/Makevars.win b/src/Makevars.win index d8b614c..b479842 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -3,21 +3,15 @@ SOURCES1 = registerDynamicSymbol.cpp wrapper.cpp wrapper_rbfgs.cpp fdasrsf/DP.cp fdasrsf/bayesian.cpp fdasrsf/pair_align_functions_expomap.cpp SOURCES2 = fdaqmap/src/myVector.cpp fdaqmap/src/UnitSquareImage.cpp -OBJECTS = wrapper.o -OBJS1 = $(SOURCES1:.cpp=.o) -OBJS2 = $(SOURCES2:.cpp=.o) +SOURCES = $(SOURCES1) $(SOURCES2) + +OBJECTS = $(SOURCES:.cpp=.o) PKG_CPPFLAGS= -I. -Ifdaqmap/incl/ PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) libfdasrvf1.a libfdasrvf2.a - -all: libfdasrvf1.a libfdasrvf2.a $(SHLIB) +PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -$(SHLIB): libfdasrvf1.a libfdasrvf2.a $(OBJECTS) -libfdasrvf1.a: $(OBJS1) -libfdasrvf2.a: $(OBJS2) +all: $(SHLIB) clean: @rm -f $(SHLIB) $(OBJECTS) - @rm -f $(OBJS1) - @rm -f $(OBJS2)