Merge remote-tracking branch 'origin/stg-2.409' into ticket37

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

diff --git a/stglibs/common.lib/Makefile b/stglibs/common.lib/Makefile
index 3e52ad8d32006480269b66194f1b68d9ab68c2b7..1f662c25c3357985ec83d49a11fbb5129b7a4539 100644 (file)
--- a/stglibs/common.lib/Makefile
+++ b/stglibs/common.lib/Makefile
@@ -5,15 +5,12 @@
 include ../../Makefile.conf
 
 LIB_NAME = stgcommon
 include ../../Makefile.conf
 
 LIB_NAME = stgcommon

-PROG = lib$(LIB_NAME)

 
 SRCS = common.cpp \
        strptime.cpp
 
 INCS = common.h
 
 
 SRCS = common.cpp \
        strptime.cpp
 
 INCS = common.h
 

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

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