Link against smux library instead of plain object files

diff --git a/projects/stargazer/plugins/other/smux/Makefile b/projects/stargazer/plugins/other/smux/Makefile
index e92982733b5d9b6db02e5905d7172f4e97d0faf3..b99caab9bc9da2ff2d3932e21eb485c10d73c97d 100644 (file)
--- a/projects/stargazer/plugins/other/smux/Makefile
+++ b/projects/stargazer/plugins/other/smux/Makefile
@@ -8,74 +8,9 @@ SRCS =  smux.cpp \
        sensors.cpp \
        handlers.cpp \
        utils.cpp \
-       types.cpp \
-       asn1/DisplayString.c \
-       asn1/PhysAddress.c \
-       asn1/IfEntry.c \
-       asn1/AtEntry.c \
-       asn1/IpAddrEntry.c \
-       asn1/IpRouteEntry.c \
-       asn1/IpNetToMediaEntry.c \
-       asn1/TcpConnEntry.c \
-       asn1/UdpEntry.c \
-       asn1/EgpNeighEntry.c \
-       asn1/ObjectName.c \
-       asn1/ObjectSyntax.c \
-       asn1/SimpleSyntax.c \
-       asn1/ApplicationSyntax.c \
-       asn1/NetworkAddress.c \
-       asn1/IpAddress.c \
-       asn1/Counter.c \
-       asn1/Gauge.c \
-       asn1/TimeTicks.c \
-       asn1/Opaque.c \
-       asn1/Message.c \
-       asn1/PDUs.c \
-       asn1/GetRequest-PDU.c \
-       asn1/GetNextRequest-PDU.c \
-       asn1/GetResponse-PDU.c \
-       asn1/SetRequest-PDU.c \
-       asn1/PDU.c \
-       asn1/Trap-PDU.c \
-       asn1/VarBind.c \
-       asn1/VarBindList.c \
-       asn1/SMUX-PDUs.c \
-       asn1/OpenPDU.c \
-       asn1/SimpleOpen.c \
-       asn1/ClosePDU.c \
-       asn1/RReqPDU.c \
-       asn1/RRspPDU.c \
-       asn1/SOutPDU.c \
-       asn1/ANY.c \
-       asn1/BOOLEAN.c \
-       asn1/INTEGER.c \
-       asn1/NULL.c \
-       asn1/NativeEnumerated.c \
-       asn1/NativeInteger.c \
-       asn1/OBJECT_IDENTIFIER.c \
-       asn1/asn_SEQUENCE_OF.c \
-       asn1/asn_SET_OF.c \
-       asn1/constr_CHOICE.c \
-       asn1/constr_SEQUENCE.c \
-       asn1/constr_SEQUENCE_OF.c \
-       asn1/constr_SET_OF.c \
-       asn1/OCTET_STRING.c \
-       asn1/BIT_STRING.c \
-       asn1/asn_codecs_prim.c \
-       asn1/ber_tlv_length.c \
-       asn1/ber_tlv_tag.c \
-       asn1/ber_decoder.c \
-       asn1/der_encoder.c \
-       asn1/constr_TYPE.c \
-       asn1/constraints.c \
-       asn1/xer_support.c \
-       asn1/xer_decoder.c \
-       asn1/xer_encoder.c \
-       asn1/per_support.c \
-       asn1/per_decoder.c \
-       asn1/per_encoder.c
+       types.cpp
 
-STGLIBS = -lstgcommon
+STGLIBS = -lstgcommon -lstgsmux
 
 CXXFLAGS += -Iasn1
 

diff --git a/projects/stargazer/plugins/other/smux/handlers.cpp b/projects/stargazer/plugins/other/smux/handlers.cpp
index cad9739f7fe8ca63a7be2ae1f404e645f2a72fc3..19304c52245e1ed9abe0b18a1f423e7cf3fbc4eb 100644 (file)
--- a/projects/stargazer/plugins/other/smux/handlers.cpp
+++ b/projects/stargazer/plugins/other/smux/handlers.cpp
@@ -1,7 +1,7 @@
-#include "asn1/GetRequest-PDU.h"
-#include "asn1/GetResponse-PDU.h"
-#include "asn1/VarBindList.h"
-#include "asn1/VarBind.h"
+#include "stg/GetRequest-PDU.h"
+#include "stg/GetResponse-PDU.h"
+#include "stg/VarBindList.h"
+#include "stg/VarBind.h"
 
 #include "stg/common.h"
 

diff --git a/projects/stargazer/plugins/other/smux/sensors.cpp b/projects/stargazer/plugins/other/smux/sensors.cpp
index 48809032d7b9dcc35c30b966af98d59359b6d69d..7721d7b7dc3831a4889bb6225992d8e29c9cf18c 100644 (file)
--- a/projects/stargazer/plugins/other/smux/sensors.cpp
+++ b/projects/stargazer/plugins/other/smux/sensors.cpp
@@ -1,4 +1,4 @@
-#include "asn1/INTEGER.h"
+#include "stg/INTEGER.h"
 
 #include "stg/user.h"
 

diff --git a/projects/stargazer/plugins/other/smux/sensors.h b/projects/stargazer/plugins/other/smux/sensors.h
index dbfb807b34c062c1d8bf1631c5f3f9036f93a010..37bd20200b952db7fbae7bae31b8d3b514e1c1f7 100644 (file)
--- a/projects/stargazer/plugins/other/smux/sensors.h
+++ b/projects/stargazer/plugins/other/smux/sensors.h
@@ -7,7 +7,7 @@
 #include "stg/tariffs.h"
 #include "stg/user_property.h"
 
-#include "asn1/ObjectSyntax.h"
+#include "stg/ObjectSyntax.h"
 
 #include "value2os.h"
 #include "types.h"

diff --git a/projects/stargazer/plugins/other/smux/smux.h b/projects/stargazer/plugins/other/smux/smux.h
index aaf5514cd4db506b1b9b85630bcae2a0f779c72d..bbcada9da59e58a0d8ca6056699b9a946ed29d1e 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.h
+++ b/projects/stargazer/plugins/other/smux/smux.h
@@ -6,8 +6,8 @@
 #include <string>
 #include <map>
 
-#include "asn1/SMUX-PDUs.h"
-#include "asn1/ObjectSyntax.h"
+#include "stg/SMUX-PDUs.h"
+#include "stg/ObjectSyntax.h"
 
 #include "stg/os_int.h"
 #include "stg/plugin.h"

diff --git a/projects/stargazer/plugins/other/smux/types.h b/projects/stargazer/plugins/other/smux/types.h
index 7d7adac2f6e70e5ebed0be7019b2d13c5244feae..974d56bf351b09bd888236f916c3217bfe7a400c 100644 (file)
--- a/projects/stargazer/plugins/other/smux/types.h
+++ b/projects/stargazer/plugins/other/smux/types.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include <istream>
 
-#include "asn1/OBJECT_IDENTIFIER.h"
+#include "stg/OBJECT_IDENTIFIER.h"
 
 class OID {
     public:

diff --git a/projects/stargazer/plugins/other/smux/utils.cpp b/projects/stargazer/plugins/other/smux/utils.cpp
index 328cea88e6cef016b94a6dd161cbd8d79e73c5c7..3a3628f58c611b0fc409de3399f63fcf91ff3222 100644 (file)
--- a/projects/stargazer/plugins/other/smux/utils.cpp
+++ b/projects/stargazer/plugins/other/smux/utils.cpp
@@ -6,11 +6,11 @@
 
 #include "stg/common.h"
 
-#include "asn1/OpenPDU.h"
-#include "asn1/ClosePDU.h"
-#include "asn1/RReqPDU.h"
-#include "asn1/ber_decoder.h"
-#include "asn1/der_encoder.h"
+#include "stg/OpenPDU.h"
+#include "stg/ClosePDU.h"
+#include "stg/RReqPDU.h"
+#include "stg/ber_decoder.h"
+#include "stg/der_encoder.h"
 
 #include "pen.h"
 #include "utils.h"

diff --git a/projects/stargazer/plugins/other/smux/utils.h b/projects/stargazer/plugins/other/smux/utils.h
index 7cfbdc78e9f579b5448f7b6297af77d97072c00b..0814bfbad72479ce223e394e6f456f14aabf4807 100644 (file)
--- a/projects/stargazer/plugins/other/smux/utils.h
+++ b/projects/stargazer/plugins/other/smux/utils.h
@@ -3,9 +3,9 @@
 
 #include <string>
 
-#include "asn1/OBJECT_IDENTIFIER.h"
-#include "SMUX-PDUs.h"
-#include "asn1/GetResponse-PDU.h"
+#include "stg/OBJECT_IDENTIFIER.h"
+#include "stg/SMUX-PDUs.h"
+#include "stg/GetResponse-PDU.h"
 
 bool WaitPackets(int sd);
 bool String2OI(const std::string & str, OBJECT_IDENTIFIER_t * oi);

diff --git a/projects/stargazer/plugins/other/smux/value2os.h b/projects/stargazer/plugins/other/smux/value2os.h
index 830fb3b34a5695b3b6d4e6f60229cdd16af4e429..420616a1e97b8887f0bd18dcf4738706aa6c7fe9 100644 (file)
--- a/projects/stargazer/plugins/other/smux/value2os.h
+++ b/projects/stargazer/plugins/other/smux/value2os.h
@@ -1,6 +1,8 @@
 #ifndef __VALUE_2_OS_H__
 #define __VALUE_2_OS_H__
 
+#include "stg/ObjectSyntax.h"
+
 template <typename T>
 bool ValueToOS(const T & value, ObjectSyntax * objectSyntax);