Menu
▾
▴
[Ptpd-commit] SF.net SVN: ptpd:[307] trunk
|
From: <gn...@us...> - 2013-02-26 19:55:19
|
Revision: 307
http://sourceforge.net/p/ptpd/code/307
Author: gnn
Date: 2013-02-26 19:55:16 +0000 (Tue, 26 Feb 2013)
Log Message:
-----------
Merge support for building with autotools.
Obtained from: Harlan Stenn
Modified Paths:
--------------
trunk/src/protocol.c
Added Paths:
-----------
trunk/Makefile.am
trunk/Makefile.old
trunk/README.repocheckout
trunk/configure.ac
trunk/m4/
trunk/src/Makefile.am
trunk/src/Makefile.old
Removed Paths:
-------------
trunk/Makefile
trunk/src/Makefile
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2013-02-25 19:09:44 UTC (rev 306)
+++ trunk 2013-02-26 19:55:16 UTC (rev 307)
Property changes on: trunk
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1 ##
+/branches/hms-autotools:287-306
\ No newline at end of property
Deleted: trunk/Makefile
===================================================================
--- trunk/Makefile 2013-02-25 19:09:44 UTC (rev 306)
+++ trunk/Makefile 2013-02-26 19:55:16 UTC (rev 307)
@@ -1,31 +0,0 @@
-# Root Makefile for ptpd, used for cutting releases and release candidates
-
-NAME = ptpd
-VERSION = ${NAME}-2.2.2
-RC = ${NAME}-2-RC-0
-
-rc:
- (cd src; make clean)
- mkdir $(RC)
- (cd $(RC); \
- ln -s ../src .; \
- ln -s ../doc .; \
- ln -s ../tools .; \
- ln -s ../COPYRIGHT .; \
- ln -s ../ChangeLog .; \
- ln -s ../Makefile .; \
- ln -s ../README .)
- tar cvzf $(RC).tar.gz -L --exclude .o --exclude Doxygen --exclude .svn --exclude .dep --exclude core $(RC)
-
-release:
- (cd src; make clean)
- mkdir $(VERSION)
- (cd $(VERSION); \
- ln -s ../src .; \
- ln -s ../doc .; \
- ln -s ../tools .; \
- ln -s ../COPYRIGHT .; \
- ln -s ../ChangeLog .; \
- ln -s ../Makefile .; \
- ln -s ../README .)
- tar cvzf $(VERSION).tar.gz -L --exclude .o --exclude Doxygen --exclude .svn --exclude .dep --exclude core $(VERSION)
Copied: trunk/Makefile.am (from rev 306, branches/hms-autotools/Makefile.am)
===================================================================
--- trunk/Makefile.am (rev 0)
+++ trunk/Makefile.am 2013-02-26 19:55:16 UTC (rev 307)
@@ -0,0 +1,31 @@
+ACLOCAL_AMFLAGS = -I m4
+
+NULL =
+
+SUBDIRS = \
+ src \
+ $(NULL)
+
+EXTRA_DIST = \
+ ChangeLog \
+ NEWS \
+ README \
+ \
+ doc \
+ tools \
+ \
+ $(NULL)
+
+CLEANFILES =
+#DISTCLEANFILES = .gcc-warning
+
+BUILT_SOURCES = \
+ libtool \
+ $(NULL)
+
+#dist-hook:
+# @find $(distdir) -type d -name SCCS -print | xargs rm -rf
+
+libtool: $(LIBTOOL_DEPS)
+ ./config.status --recheck
+
Copied: trunk/Makefile.old (from rev 306, branches/hms-autotools/Makefile.old)
===================================================================
--- trunk/Makefile.old (rev 0)
+++ trunk/Makefile.old 2013-02-26 19:55:16 UTC (rev 307)
@@ -0,0 +1,33 @@
+# Root Makefile for ptpd, used for cutting releases and release candidates
+
+NAME = ptpd
+VERSION = ${NAME}-2.2.2
+RC = ${NAME}-2-RC-0
+
+rc:
+ (cd src; make clean)
+ mkdir $(RC)
+ (cd $(RC); \
+ ln -s ../src .; \
+ ln -s ../doc .; \
+ ln -s ../tools .; \
+ ln -s ../COPYRIGHT .; \
+ ln -s ../ChangeLog .; \
+ ln -s ../Makefile .; \
+ ln -s ../README .; \
+ ln -s ../RELEASE_NOTES .)
+ tar cvzf $(RC).tar.gz -L --exclude .o --exclude Doxygen --exclude .svn --exclude .dep --exclude core $(RC)
+
+release:
+ (cd src; make clean)
+ mkdir $(VERSION)
+ (cd $(VERSION); \
+ ln -s ../src .; \
+ ln -s ../doc .; \
+ ln -s ../tools .; \
+ ln -s ../COPYRIGHT .; \
+ ln -s ../ChangeLog .; \
+ ln -s ../Makefile .; \
+ ln -s ../README .; \
+ ln -s ../RELEASE_NOTES .)
+ tar cvzf $(VERSION).tar.gz -L --exclude .o --exclude Doxygen --exclude .svn --exclude .dep --exclude core $(VERSION)
Copied: trunk/README.repocheckout (from rev 306, branches/hms-autotools/README.repocheckout)
===================================================================
--- trunk/README.repocheckout (rev 0)
+++ trunk/README.repocheckout 2013-02-26 19:55:16 UTC (rev 307)
@@ -0,0 +1,11 @@
+If you are getting this code from a tarball distribution, this
+file does not apply to you.
+
+If you are getting this code from a repo checkout, you will need to
+have autoconf, automake, and libtool installed.
+
+Run:
+
+ % autoreconf -vi
+
+to generate the build environment.
Copied: trunk/configure.ac (from rev 306, branches/hms-autotools/configure.ac)
===================================================================
--- trunk/configure.ac (rev 0)
+++ trunk/configure.ac 2013-02-26 19:55:16 UTC (rev 307)
@@ -0,0 +1,269 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+m4_include([m4/version.m4])
+AC_PREREQ(2.61)
+AC_INIT(
+ [ptpd2],
+ [VERSION_NUMBER],
+ [ptp...@nw...],
+ [],
+ [PTPD_URL]dnl
+)
+AC_CONFIG_SRCDIR([src/arith.c])
+AC_CONFIG_HEADER([config.h])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([1.10 foreign -Wall])
+
+# Checks for programs.
+AC_PROG_CXX
+AC_PROG_AWK
+AC_PROG_CC
+AC_PROG_LIBTOOL
+
+AC_ARG_WITH(
+ [net-snmp-config],
+ [AS_HELP_STRING(
+ [--with-net-snmp-config],
+ [+ =net-snmp-config]
+ )],
+ [ans=$withval],
+ [ans=yes]
+)
+case "$ans" in
+ no)
+ ;;
+ yes)
+ ans=net-snmp-config
+ ;;
+ /*)
+ ;;
+ */*)
+ AC_MSG_ERROR([--with-net-snmp-config takes either a name or an absolute path])
+ ;;
+ *)
+ ;;
+esac
+PROG_NET_SNMP_CONFIG=$ans
+case "$PROG_NET_SNMP_CONFIG" in
+ no)
+ ;;
+ *)
+ AC_PATH_PROG([PATH_NET_SNMP_CONFIG], [$PROG_NET_SNMP_CONFIG])
+ AS_UNSET([ac_cv_path_PATH_NET_SNMP_CONFIG])
+ ;;
+esac
+
+AC_MSG_CHECKING([if we want to build SNMP support])
+AC_ARG_ENABLE(
+ [snmp],
+ [AS_HELP_STRING(
+ [--enable-snmp],
+ [disable support for SNMP]
+ )],
+ [ptpd_ok=$enableval],
+ [case "$PATH_NET_SNMP_CONFIG" in
+ /*)
+ ptpd_ok=yes
+ ;;
+ *)
+ ptpd_ok=no
+ ;;
+ esac]
+)
+
+ptpd_snmp_enabled=0
+case "$ptpd_ok" in
+ yes)
+ ptpd_snmp_enabled=1
+ PTP_SNMP="-DPTPD_SNMP"
+ ;;
+esac
+AM_CONDITIONAL([SNMP], [test x$ptpd_snmp_enabled = x1])
+AC_MSG_RESULT([$ptpd_ok])
+
+case "$ptpd_ok" in
+ yes)
+ case "$PATH_NET_SNMP_CONFIG" in
+ /*)
+ SNMP_LIBS=`$PATH_NET_SNMP_CONFIG --agent-libs`
+ AC_SUBST([SNMP_LIBS])
+ # HMS: we really want to separate CPPFLAGS and CFLAGS
+ foo=`$PATH_NET_SNMP_CONFIG --base-cflags`
+ SNMP_CPPFLAGS=
+ SNMP_CFLAGS=
+ for i in $foo; do
+ case "$i" in
+ -D*|-F*|-U*|-I*)
+ SNMP_CPPFLAGS="$SNMP_CPPFLAGS $i"
+ ;;
+ *) SNMP_CFLAGS="$SNMP_CFLAGS $i"
+ ;;
+ esac
+ done
+ AC_SUBST([SNMP_CPPFLAGS])
+ AC_SUBST([SNMP_CFLAGS])
+
+ save_CFLAGS=$CFLAGS
+ save_CPPFLAGS=$CPPFLAGS
+ save_LIBS=$LIBS
+ CFLAGS=$SNMP_CFLAGS
+ CPPFLAGS=$SNMP_CPPFLAGS
+
+ AC_CHECK_HEADER(
+ [net-snmp/net-snmp-config.h],
+ [],
+ [AC_MSG_WARN([net-snmp-config present but net-snmp headers are not available!])]
+ )
+
+ CFLAGS=$save_CFLAGS
+ AS_UNSET([save_CFLAGS])
+ CPPFLAGS=$save_CPPFLAGS
+ AS_UNSET([save_CPPFLAGS])
+ LIBS=$save_LIBS
+ AS_UNSET([save_LIBS])
+ ;;
+ *)
+ AC_MSG_WARN([Cannot build with SNMP support - net-snmp-config cannot be found])
+ ;;
+ esac
+ ;;
+esac
+
+# Checks for libraries.
+AC_CHECK_LIB([m], [pow])
+AC_CHECK_LIB([rt], [clock_gettime])
+
+# Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_HEADER_STDBOOL
+AC_TYPE_INT64_T
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_HEADER_TIME
+AC_TYPE_UINT32_T
+AC_TYPE_UINT64_T
+AC_TYPE_UINT8_T
+AC_C_VOLATILE
+
+# Checks for library functions.
+AC_PROG_GCC_TRADITIONAL
+AC_FUNC_MALLOC
+AC_FUNC_MEMCMP
+AC_FUNC_SELECT_ARGTYPES
+AC_TYPE_SIGNAL
+AC_FUNC_STRFTIME
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS([clock_gettime dup2 ftruncate gettimeofday inet_ntoa memset pow select socket strchr strdup strerror strtol])
+
+AC_MSG_CHECKING([for RUNTIME_DEBUG])
+AC_ARG_ENABLE(
+ [runtime-debug],
+ [AS_HELP_STRING(
+ [--enable-runtime-debug],
+ [Enable all debug messages]
+ )],
+ [ptp_runtime=$enableval],
+ [ptp_runtime=no]
+)
+AC_MSG_RESULT([$ptp_runtime])
+case "$ptp_runtime" in
+ yes)
+ PTP_DBL="-DRUNTIME_DEBUG"
+ ;;
+ *)
+ AC_MSG_CHECKING([for (old-style) debug message level])
+ AC_ARG_ENABLE(
+ [debug-level],
+ [AS_HELP_STRING(
+ [--enable-debug-level={basic,medium,all}],
+ [debug message level: basic, medium, all]
+ )],
+ [ptp_dblevel=$enableval],
+ [ptp_dblevel=no]
+ )
+ AC_MSG_RESULT([$ptp_dblevel])
+ case "$ptp_dblevel" in
+ "basic")
+ PTP_DBL="-DPTPD_DBG"
+ ;;
+ "medium")
+ PTP_DBL="-DPTPD_DBG2"
+ ;;
+ "all")
+ PTP_DBL="-DPTPD_DBGV"
+ ;;
+ *) PTP_DBL=""
+ ;;
+ esac
+ ;;
+esac
+AC_SUBST(PTP_DBL)
+
+AC_MSG_CHECKING([for daemon mode])
+AC_ARG_ENABLE(
+ [daemon],
+ [AS_HELP_STRING(
+ [--disable-daemon],
+ [Disable daemon mode (enabled by default)]
+ )],
+ [ptp_daemon=$enableval],
+ [ptp_daemon=yes]
+)
+AC_MSG_RESULT([$ptp_daemon])
+case "$ptp_daemon" in
+ no)
+ PTP_DAEMON="-DPTPD_NO_DAEMON"
+ ;;
+esac
+AC_SUBST(PTP_DAEMON)
+
+AC_MSG_CHECKING([for experimental options])
+AC_ARG_ENABLE(
+ [experimental-options],
+ [AS_HELP_STRING(
+ [--enable-experimental-options],
+ [Enable experimental options (disabled by default)]
+ )],
+ [ptp_exp=$enableval],
+ [ptp_exp=no]
+)
+AC_MSG_RESULT([$ptp_exp])
+case "$ptp_exp" in
+ yes)
+ PTP_EXP="-DPTPD_EXPERIMENTAL"
+ ;;
+esac
+AC_SUBST(PTP_EXP)
+
+AC_MSG_CHECKING([for SIGUSR2 support])
+AC_ARG_ENABLE(
+ [sigusr2],
+ [AS_HELP_STRING(
+ [--enable-sigusr2={domain,debug}],
+ [Enable SIGUSR2 support, cycle PTP domain #, or debug level (disabled by default)]
+ )],
+ [ptp_sigusr2=$enableval],
+ [ptp_sigusr2=no]
+)
+AC_MSG_RESULT([$ptp_sigusr2])
+case "$ptp_sigusr2" in
+ domain)
+ PTP_SIGUSR2="-DDBG_SIGUSR2_CHANGE_DOMAIN"
+ ;;
+ debug)
+ # We could/should check to be sure that RUNTIME_DEBUG is set...
+ PTP_SIGUSR2="-DDBG_SIGUSR2_CHANGE_DEBUG"
+ ;;
+esac
+AC_SUBST(PTP_SIGUSR2)
+
+AC_CONFIG_FILES([Makefile
+ src/Makefile])
+AC_OUTPUT
Deleted: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile 2013-02-25 19:09:44 UTC (rev 306)
+++ trunk/src/Makefile 2013-02-26 19:55:16 UTC (rev 307)
@@ -1,109 +0,0 @@
-# Makefile for ptpd2
-
-#
-# Compile time defines:
-# -DRUNTIME_DEBUG
-# if defined: all debug messages are included, and are either selected at startup (-B)
-# and runtime (SIGUSR2) (implies -DPTPD_DBGV) using syslog,
-# add "*.debug /var/log/debug" to /etc/rsyslog.conf to see debug messages
-# if undefined: individual defines select which messages will be included and presented (old behaviour)
-#
-# -DPTPD_DBG basic debug messages
-# -DPTPD_DBG2 adds basic protocol messages, +ignored messages reasons
-# -DPTPD_DBGV adds all debug messages
-#
-# -DPTPD_NO_DAEMON forces option -c
-#
-# -DPTPD_EXPERIMENTAL Allows non-standard compliant experimental options:
-# -U: Hybrid mode
-# -I: choose multicast group
-# -DPTPD_SNMP Enables SNMP agent support (PTP-MIB)
-#
-# Mutually exclusive defines (useful for testing):
-# -DDBG_SIGUSR2_CHANGE_DOMAIN: SIGUSR2 cycles the PTP domain number
-# -DDBG_SIGUSR2_CHANGE_DEBUG: SIGUSR2 cycles the current debug level (if RUNTIME_DEBUG is defined)
-#
-#######
-
-VERSION = 2.3.0
-
-RM = rm -f
-SYMLINK = ln -s
-
-# SNMP support?
-SNMP = yes
-
-# start with CFLAGS += ..., so additional CFLAGs can be specified e.g. on the make command line
-CFLAGS += -Wall -g -fPIC
-
-CFLAGS += -DRUNTIME_DEBUG
-#CFLAGS += -DPTPD_DBG
-#CFLAGS += -DPTPD_DBG2
-#CFLAGS += -DPTPD_DBGV
-
-#CFLAGS += -DPTPD_NO_DAEMON
-#CFLAGS += -DDBG_SIGUSR2_CHANGE_DOMAIN
-CFLAGS += -DDBG_SIGUSR2_CHANGE_DEBUG
-
-CFLAGS += -DPTPD_EXPERIMENTAL
-
-LDFLAGS = -lm -lrt
-STATICLIBFLAGS = rcs
-SHAREDLIBFLAGS = -shared -Wl,-soname
-
-PROG = ptpd2
-STATICLIB = libptpd2.a
-SHAREDLIB = libptpd2.so
-SHAREDLIBVER = $(SHAREDLIB).$(VERSION)
-
-SRCS = ptpd.c arith.c bmc.c protocol.c display.c management.c \
- dep/msg.c dep/net.c dep/servo.c dep/startup.c dep/sys.c dep/timer.c
-
-# SNMP
-ifeq ($(SNMP),yes)
-LDFLAGS += `net-snmp-config --agent-libs`
-CFLAGS += `net-snmp-config --base-cflags`
-CFLAGS += -DPTPD_SNMP
-SRCS += dep/snmp.c
-endif
-
-OBJS = $(SRCS:.c=.o)
-
-HDRS = ptpd.h constants.h datatypes.h \
- dep/ptpd_dep.h dep/constants_dep.h dep/datatypes_dep.h
-
-CSCOPE = cscope
-GTAGS = gtags
-DOXYGEN = doxygen
-
-TAGFILES = GPATH GRTAGS GSYMS GTAGS cscope.in.out cscope.out cscope.po.out
-
-.c.o:
- $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
-
-
-$(PROG): $(OBJS)
- $(CC) -o $@ $(OBJS) $(LDFLAGS)
-
-$(STATICLIB): $(OBJS)
- $(AR) $(STATICLIBFLAGS) $(STATICLIB) $(OBJS)
-
-$(SHAREDLIB): $(OBJS)
- $(CC) $(SHAREDLIBFLAGS),$(SHAREDLIB) -o $(SHAREDLIB) $(OBJS)
- # create shared lib symlink with ptpd version extension
- $(SYMLINK) $(SHAREDLIB) $(SHAREDLIBVER)
-
-all: $(PROG) $(STATICLIB) $(SHAREDLIB)
-
-$(OBJS): $(HDRS)
-
-tags:
- $(CSCOPE) -R -q -b
- $(GTAGS)
- $(DOXYGEN) Doxyfile
-
-clean:
- $(RM) $(PROG) $(STATICLIB) $(SHAREDLIB) $(SHAREDLIBVER) $(OBJS) $(TAGFILES) make.out
-
-realclean: clean
- $(RM) $(TAGFILES)
Copied: trunk/src/Makefile.am (from rev 306, branches/hms-autotools/src/Makefile.am)
===================================================================
--- trunk/src/Makefile.am (rev 0)
+++ trunk/src/Makefile.am 2013-02-26 19:55:16 UTC (rev 307)
@@ -0,0 +1,52 @@
+# Makefile for ptpd2
+
+lib_LTLIBRARIES = $(LIBPTPD2_LIBS_LA)
+bin_PROGRAMS = ptpd2
+
+AM_CFLAGS = $(SNMP_CFLAGS)
+AM_CPPFLAGS = $(SNMP_CPPFLAGS)
+AM_LDFLAGS = $(SNMP_LIBS)
+
+AM_CPPFLAGS += $(PTP_DBL) $(PTP_DAEMON) $(PTP_EXP) $(PTP_SNMP) $(PTP_SIGUSR2)
+
+NULL=
+
+#VERSION = 2.3.0
+#SHAREDLIBVER = $(SHAREDLIB).$(VERSION)
+
+ptpd2_SOURCES = \
+ arith.c \
+ bmc.c \
+ constants.h \
+ datatypes.h \
+ dep/constants_dep.h \
+ dep/datatypes_dep.h \
+ dep/msg.c \
+ dep/net.c \
+ dep/ptpd_dep.h \
+ dep/servo.c \
+ dep/startup.c \
+ dep/sys.c \
+ dep/timer.c \
+ display.c \
+ management.c \
+ protocol.c \
+ ptpd.c \
+ ptpd.h \
+ $(NULL)
+
+# SNMP
+if SNMP
+ptpd2_SOURCES += dep/snmp.c
+endif
+
+CSCOPE = cscope
+GTAGS = gtags
+DOXYGEN = doxygen
+
+TAGFILES = GPATH GRTAGS GSYMS GTAGS cscope.in.out cscope.out cscope.po.out
+
+#tags:
+# $(CSCOPE) -R -q -b
+# $(GTAGS)
+# $(DOXYGEN) Doxyfile
Copied: trunk/src/Makefile.old (from rev 306, branches/hms-autotools/src/Makefile.old)
===================================================================
--- trunk/src/Makefile.old (rev 0)
+++ trunk/src/Makefile.old 2013-02-26 19:55:16 UTC (rev 307)
@@ -0,0 +1,109 @@
+# Makefile for ptpd2
+
+#
+# Compile time defines:
+# -DRUNTIME_DEBUG
+# if defined: all debug messages are included, and are either selected at startup (-B)
+# and runtime (SIGUSR2) (implies -DPTPD_DBGV) using syslog,
+# add "*.debug /var/log/debug" to /etc/rsyslog.conf to see debug messages
+# if undefined: individual defines select which messages will be included and presented (old behaviour)
+#
+# -DPTPD_DBG basic debug messages
+# -DPTPD_DBG2 adds basic protocol messages, +ignored messages reasons
+# -DPTPD_DBGV adds all debug messages
+#
+# -DPTPD_NO_DAEMON forces option -c
+#
+# -DPTPD_EXPERIMENTAL Allows non-standard compliant experimental options:
+# -U: Hybrid mode
+# -I: choose multicast group
+# -DPTPD_SNMP Enables SNMP agent support (PTP-MIB)
+#
+# Mutually exclusive defines (useful for testing):
+# -DDBG_SIGUSR2_CHANGE_DOMAIN: SIGUSR2 cycles the PTP domain number
+# -DDBG_SIGUSR2_CHANGE_DEBUG: SIGUSR2 cycles the current debug level (if RUNTIME_DEBUG is defined)
+#
+#######
+
+VERSION = 2.3.0
+
+RM = rm -f
+SYMLINK = ln -s
+
+# SNMP support?
+SNMP = yes
+
+# start with CFLAGS += ..., so additional CFLAGs can be specified e.g. on the make command line
+CFLAGS += -Wall -g -fPIC
+
+CFLAGS += -DRUNTIME_DEBUG
+#CFLAGS += -DPTPD_DBG
+#CFLAGS += -DPTPD_DBG2
+#CFLAGS += -DPTPD_DBGV
+
+#CFLAGS += -DPTPD_NO_DAEMON
+#CFLAGS += -DDBG_SIGUSR2_CHANGE_DOMAIN
+CFLAGS += -DDBG_SIGUSR2_CHANGE_DEBUG
+
+CFLAGS += -DPTPD_EXPERIMENTAL
+
+LDFLAGS = -lm -lrt
+STATICLIBFLAGS = rcs
+SHAREDLIBFLAGS = -shared -Wl,-soname
+
+PROG = ptpd2
+STATICLIB = libptpd2.a
+SHAREDLIB = libptpd2.so
+SHAREDLIBVER = $(SHAREDLIB).$(VERSION)
+
+SRCS = ptpd.c arith.c bmc.c protocol.c display.c management.c \
+ dep/msg.c dep/net.c dep/servo.c dep/startup.c dep/sys.c dep/timer.c
+
+# SNMP
+ifeq ($(SNMP),yes)
+LDFLAGS += `net-snmp-config --agent-libs`
+CFLAGS += `net-snmp-config --base-cflags`
+CFLAGS += -DPTPD_SNMP
+SRCS += dep/snmp.c
+endif
+
+OBJS = $(SRCS:.c=.o)
+
+HDRS = ptpd.h constants.h datatypes.h \
+ dep/ptpd_dep.h dep/constants_dep.h dep/datatypes_dep.h
+
+CSCOPE = cscope
+GTAGS = gtags
+DOXYGEN = doxygen
+
+TAGFILES = GPATH GRTAGS GSYMS GTAGS cscope.in.out cscope.out cscope.po.out
+
+.c.o:
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
+
+
+$(PROG): $(OBJS)
+ $(CC) -o $@ $(OBJS) $(LDFLAGS)
+
+$(STATICLIB): $(OBJS)
+ $(AR) $(STATICLIBFLAGS) $(STATICLIB) $(OBJS)
+
+$(SHAREDLIB): $(OBJS)
+ $(CC) $(SHAREDLIBFLAGS),$(SHAREDLIB) -o $(SHAREDLIB) $(OBJS)
+ # create shared lib symlink with ptpd version extension
+ $(SYMLINK) $(SHAREDLIB) $(SHAREDLIBVER)
+
+all: $(PROG) $(STATICLIB) $(SHAREDLIB)
+
+$(OBJS): $(HDRS)
+
+tags:
+ $(CSCOPE) -R -q -b
+ $(GTAGS)
+ $(DOXYGEN) Doxyfile
+
+clean:
+ $(RM) $(PROG) $(STATICLIB) $(SHAREDLIB) $(SHAREDLIBVER) $(OBJS) $(TAGFILES) make.out
+
+realclean: clean
+ $(RM) $(TAGFILES)
Modified: trunk/src/protocol.c
===================================================================
--- trunk/src/protocol.c 2013-02-25 19:09:44 UTC (rev 306)
+++ trunk/src/protocol.c 2013-02-26 19:55:16 UTC (rev 307)
@@ -836,7 +836,9 @@
ptpClock->leapSecondInProgress=FALSE;
ptpClock->leap59 = FALSE;
ptpClock->leap61 = FALSE;
+#if !defined(__APPLE__)
unsetTimexFlags(STA_INS | STA_DEL, TRUE);
+#endif /* apple */
}
}
DBG2("___ Announce: received Announce from current Master, so reset the Announce timer\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|