X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/90e389f6ec12e60a62c362296ffcf314feb5b03d..1a494f2f54ac08ce3bce21d2e2a29f63c0ce0b91:/projects/rscriptd/Makefile diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile index 2b6cbc1c..a009a5c1 100644 --- a/projects/rscriptd/Makefile +++ b/projects/rscriptd/Makefile @@ -18,12 +18,6 @@ STGLIBS = -lstglogger \ LIBS += $(LIB_THREAD) -#ifeq ($(OS),linux) -#LIBS += -ldl -#else -#LIBS += -lc -#endif - SEARCH_DIRS = -I $(DIR_INCLUDE) OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS)))) @@ -31,7 +25,7 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS)))) CXXFLAGS += -Wall LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB) -vpath %.so $(DIR_LIB) +vpath %.a $(DIR_LIB) .PHONY: all clean distclean libs install uninstall all: libs $(PROG) ../../Makefile.conf @@ -40,7 +34,7 @@ libs: $(MAKE) -C $(DIR_LIBSRC) $(PROG): $(OBJS) $(STGLIBS) - $(CC) $^ $(LDFLAGS) $(LIBS) -o $(PROG) + $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG) clean: rm -f deps $(PROG) *.o tags *.*~ .OS