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 eb0959b78aaeb62b3d652371fe4e92b0e5af857a..932e270948b62d3b78fed5186e6889e53dd304b2 100644 (file)
--- a/stglibs/common.lib/Makefile
+++ b/stglibs/common.lib/Makefile
@@ -4,16 +4,15 @@
 
 include ../../Makefile.conf
 
 
 include ../../Makefile.conf
 

-LIB_NAME = stg_common
-PROG = lib$(LIB_NAME)
+LIB_NAME = stgcommon

 
 SRCS = common.cpp \
 
 SRCS = common.cpp \

-       stg_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