cleanup

jdtuck · Jul 16, 2024 · 81bfed9 · 81bfed9
1 parent 638a6b8
commit 81bfed9
Showing 1 changed file with 5 additions and 11 deletions.
diff --git 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)