Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / stglibs / common.lib / Makefile

diff --git a/stglibs/common.lib/Makefile b/stglibs/common.lib/Makefile
index 0ef14dea0a8af4f700317e1a2d0dad97b69972a8..932e270948b62d3b78fed5186e6889e53dd304b2 100644 (file)
--- a/stglibs/common.lib/Makefile
+++ b/stglibs/common.lib/Makefile
@@ -7,12 +7,12 @@ include ../../Makefile.conf
 LIB_NAME = stgcommon
 
 SRCS = common.cpp \
 LIB_NAME = stgcommon
 
 SRCS = common.cpp \

-       strptime.cpp
+       strptime.cpp \
+       blockio.cpp

 
 

-INCS = common.h
+INCS = common.h \
+       blockio.h

 
 

-ifneq ($(OS),linux)
-LIBS += -liconv
-endif
+LIBS += $(LIBICONV)

 
 include ../Makefile.in
 
 include ../Makefile.in