summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>2010-04-17 23:55:07 -0700
committerInaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>2010-04-17 23:55:07 -0700
commit26a3d63fe3bc511b6efe0ec1aef0b5654f038c4b (patch)
tree13cbc5ed41247c0977acdbb6f9cc94d6b81c82b1
parent78da507677c064a11797d8cab424bde48f9d956e (diff)
automake: fix 'make distcheck' [auto* template update]
Signed-off-by: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
-rw-r--r--InfraStack/OSAgnostic/Common/L4Common/Makefile.in11
-rw-r--r--InfraStack/OSAgnostic/Product/AppSrvInfra/Makefile.in4
-rw-r--r--InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/Makefile.in4
-rw-r--r--InfraStack/OSAgnostic/Product/Instrumantation/Makefile.in8
-rw-r--r--InfraStack/OSAgnostic/Product/Instrumantation/MocMsgProxy/Makefile.in8
-rw-r--r--InfraStack/OSAgnostic/Product/PipeHandler/Makefile.in1
-rw-r--r--InfraStack/OSAgnostic/WiMax/Agents/NDnS/Makefile.in4
-rw-r--r--InfraStack/OSDependent/Linux/OSAL/Makefile.in2
-rw-r--r--InfraStack/OSDependent/Linux/wimax_utils/wimax_monitor/Makefile.in3
-rw-r--r--InfraStack/OSDependent/Linux/wimaxcu/Makefile.in4
-rw-r--r--Makefile.in1
-rwxr-xr-xconfigure16
12 files changed, 56 insertions, 10 deletions
diff --git a/InfraStack/OSAgnostic/Common/L4Common/Makefile.in b/InfraStack/OSAgnostic/Common/L4Common/Makefile.in
index 7fb99af..9095336 100644
--- a/InfraStack/OSAgnostic/Common/L4Common/Makefile.in
+++ b/InfraStack/OSAgnostic/Common/L4Common/Makefile.in
@@ -192,6 +192,16 @@ libL4Common_la_SOURCES = $(srcdir)/SourceControl/BitmanCommon.c \
$(srcdir)/SourceControl/L4BufMan_L4Common.c \
$(top_srcdir)/InfraStack/OSDependent/Linux/L4Generated/L4BufMan_L3L4Structs.c \
$(top_srcdir)/InfraStack/OSDependent/Linux/L4Generated/L4BufMan_L3L4DmStructs.c \
+ $(top_srcdir)/InfraStack/OSDependent/Linux/L4Generated/L4BufMan_L3L4DmStructs.h \
+ $(top_srcdir)/InfraStack/OSDependent/Linux/L4Generated/L4BufMan_L3L4DmStructs_Desc.h \
+ $(top_srcdir)/InfraStack/OSDependent/Linux/L4Generated/L3L4DmStructs.h \
+ $(top_srcdir)/InfraStack/OSDependent/Linux/L4Generated/DmGroupsHeaders.h \
+ $(top_srcdir)/InfraStack/OSDependent/Linux/L4Generated/DmMonitorGroups.h \
+ $(top_srcdir)/InfraStack/OSDependent/Linux/L4Generated/L1DmMonitorGroups.h \
+ $(top_srcdir)/InfraStack/OSDependent/Linux/L4Generated/L2DmMonitorGroups.h \
+ $(top_srcdir)/InfraStack/OSDependent/Linux/L4Generated/L3DmMonitorGroups.h \
+ $(top_srcdir)/InfraStack/OSDependent/Linux/L4Generated/L2L1SdilloDmCommon.h \
+ $(top_srcdir)/InfraStack/OSDependent/Linux/L4Generated/DilloDiagnostics.h \
$(top_srcdir)/InfraStack/OSDependent/Linux/L4Generated/BasicBitmanTypes.h \
$(srcdir)/SourceControl/BitmanCommon.h \
$(srcdir)/SourceControl/Intel_80216_L4_interface.h \
@@ -203,6 +213,7 @@ libL4Common_la_SOURCES = $(srcdir)/SourceControl/BitmanCommon.c \
$(srcdir)/SourceControl/L4MonitorGroups.h \
$(srcdir)/SourceControl/Pal_General.h \
$(srcdir)/SourceControl/CommonDefinitions.h \
+ $(srcdir)/SourceControl/CommonTypes.h \
$(srcdir)/SourceControl/TypesProxy.h \
$(top_srcdir)/InfraStack/OSDependent/Linux/L4Generated/l2l3_api_ranging_enums.h \
$(top_srcdir)/InfraStack/OSDependent/Linux/L4Generated/L3L4Structs.h \
diff --git a/InfraStack/OSAgnostic/Product/AppSrvInfra/Makefile.in b/InfraStack/OSAgnostic/Product/AppSrvInfra/Makefile.in
index b2946f1..d857a6c 100644
--- a/InfraStack/OSAgnostic/Product/AppSrvInfra/Makefile.in
+++ b/InfraStack/OSAgnostic/Product/AppSrvInfra/Makefile.in
@@ -241,8 +241,10 @@ wimaxd_SOURCES = \
$(srcdir)/L5Dispatcher.c \
$(srcdir)/../../Common/L5Common/L5CommonUtils.c \
$(srcdir)/KDapiAdapter.c \
+ $(srcdir)/SVstatus.h \
$(top_srcdir)/InfraStack/OSDependent/Linux/InfraStackModules/KDapi/KDapi.c \
$(top_srcdir)/InfraStack/OSDependent/Linux/InfraStackModules/KDapi/KDapiForSim.c \
+ $(top_srcdir)/InfraStack/OSDependent/Linux/InfraStackModules/KDapi/KDapiForLinuxNlsock.h \
$(top_srcdir)/InfraStack/OSDependent/Linux/InfraStackModules/Skeletons/AppSrv/GenericMain.c \
$(top_srcdir)/InfraStack/OSDependent/Linux/InfraStackModules/Skeletons/AppSrv/GenericConsole.c \
$(top_srcdir)/InfraStack/OSDependent/Linux/InfraStackModules/Skeletons/AppSrv/GenericDaemon.c \
@@ -260,6 +262,8 @@ wimaxd_SOURCES = \
$(top_srcdir)/InfraStack/OSDependent/Linux/InfraStackModules/Skeletons/AppSrv/GenericMain.h
EXTRA_DIST = $(srcdir)/i2400m.conf $(srcdir)/iwmxsdk.rules.in \
+ $(top_srcdir)/InfraStack/OSDependent/Linux/Config/config.xml.in \
+ $(top_srcdir)/InfraStack/OSDependent/Linux/Config/dhcp_renew.sh \
iwmxsdk.rules.in
noinst_DATA = $(top_srcdir)/InfraStack/OSAgnostic/WiMax/Agents/NDnS/XML_Files/NDnSAgentConfig_forDriver.xml \
$(top_srcdir)/$(VER_INFO_BIN_FILE_SRC)
diff --git a/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/Makefile.in b/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/Makefile.in
index 7ba00ca..1792cdd 100644
--- a/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/Makefile.in
+++ b/InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/Makefile.in
@@ -200,7 +200,11 @@ libDnDAgent_la_SOURCES = \
$(srcdir)/DnDUtils.c \
$(srcdir)/L4DnDHandler.c \
$(srcdir)/../DnDWrapper/wmxSDK_DnD_Common.c \
+ $(srcdir)/../DnDWrapper/wmxSDK_DnD_Common.h \
+ $(srcdir)/../DnDWrapper/wmxSDK_DnD_Cmn.h \
+ $(srcdir)/../DnDWrapper/wmxSDK_DnD.h \
$(srcdir)/RemoveExcessFiles.c \
+ $(srcdir)/RemoveExcessFiles.h \
$(srcdir)/DnDAgent.h \
$(srcdir)/DnDUtils.h \
$(srcdir)/DnDAgent_Internal.h \
diff --git a/InfraStack/OSAgnostic/Product/Instrumantation/Makefile.in b/InfraStack/OSAgnostic/Product/Instrumantation/Makefile.in
index e6120ca..5d78155 100644
--- a/InfraStack/OSAgnostic/Product/Instrumantation/Makefile.in
+++ b/InfraStack/OSAgnostic/Product/Instrumantation/Makefile.in
@@ -276,6 +276,14 @@ libWmxInstrument_la_LIBADD = DnDAgent/libDnDAgent.la \
MocMsgProxy/libMocMsgProxy.la \
$(top_builddir)/InfraStack/OSDependent/Linux/InfraStackModules/IPCs/libSockets.la
+
+# FIXME: where do these header files really belong?
+EXTRA_DIST = \
+ MOCHandler/UDapiL5/ApplicationMocTaskDesc.h \
+ MOCHandler/UDapiL5/UDapiCommonDefines.h \
+ MOCHandler/UDapiL5/UDapiDll.h \
+ MOCHandler/UDapiL5/UDapiL5.h
+
all: all-recursive
.SUFFIXES:
diff --git a/InfraStack/OSAgnostic/Product/Instrumantation/MocMsgProxy/Makefile.in b/InfraStack/OSAgnostic/Product/Instrumantation/MocMsgProxy/Makefile.in
index e84f33a..a69e1db 100644
--- a/InfraStack/OSAgnostic/Product/Instrumantation/MocMsgProxy/Makefile.in
+++ b/InfraStack/OSAgnostic/Product/Instrumantation/MocMsgProxy/Makefile.in
@@ -191,7 +191,13 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libMocMsgProxy.la
-libMocMsgProxy_la_SOURCES = $(srcdir)/MocMsgProxy.c
+libMocMsgProxy_la_SOURCES = $(srcdir)/MocMsgProxy.c \
+ $(srcdir)/MocMsgProxy.h \
+ $(srcdir)/MocMsgProxyIF.h \
+ $(srcdir)/MOC_Types.h \
+ $(srcdir)/MOC_Utils.h \
+ $(srcdir)/Osal_TaskTypes.h
+
libMocMsgProxy_la_CFLAGS = \
-I "$(srcdir)/../DnDWrapper" \
-I "$(srcdir)/../MOCHandler/UDapiL5" \
diff --git a/InfraStack/OSAgnostic/Product/PipeHandler/Makefile.in b/InfraStack/OSAgnostic/Product/PipeHandler/Makefile.in
index 3750b52..8302855 100644
--- a/InfraStack/OSAgnostic/Product/PipeHandler/Makefile.in
+++ b/InfraStack/OSAgnostic/Product/PipeHandler/Makefile.in
@@ -219,6 +219,7 @@ libPipeHandler_la_SOURCES = \
$(top_srcdir)/InfraStack/OSAgnostic/Common/WrappersCommon/WrappersCommon.c \
$(top_srcdir)/InfraStack/OSAgnostic/Common/WrappersCommon/WrappersUtils.c \
$(top_srcdir)/InfraStack/OSDependent/Linux/InfraStackModules/TraceModule/TraceModule.c \
+ $(top_srcdir)/InfraStack/OSDependent/Linux/InfraStackModules/TraceModule/TraceAgentInternal.h \
$(srcdir)/Defs.h \
$(top_srcdir)/InfraStack/OSAgnostic/Common/L5Common/EventSubscribers.h \
$(top_srcdir)/InfraStack/OSAgnostic/Common/L5Common/IndicatorsSubscribers.h \
diff --git a/InfraStack/OSAgnostic/WiMax/Agents/NDnS/Makefile.in b/InfraStack/OSAgnostic/WiMax/Agents/NDnS/Makefile.in
index e1bc588..9af9490 100644
--- a/InfraStack/OSAgnostic/WiMax/Agents/NDnS/Makefile.in
+++ b/InfraStack/OSAgnostic/WiMax/Agents/NDnS/Makefile.in
@@ -243,6 +243,7 @@ libNDnSAgent_la_SOURCES = $(srcdir)/Source/FormatConversions.c \
$(srcdir)/L4_db/NDnSAgent_DB_Restore.c \
$(srcdir)/L4_db/NDnSAgent_DB_Save.c \
$(srcdir)/L4_db/NDnSAgent_DB_Update.c \
+ $(srcdir)/L4_db/NDnSAgent_DB_Internal.h \
$(srcdir)/L4Scanner/NDnS_L4Scanner.c \
$(srcdir)/L4Scanner/NDnSAgent_L4S_CBs.c \
$(srcdir)/L4Scanner/NDnS_L4Scanner.h \
@@ -326,6 +327,9 @@ libNDnSAgent_la_CFLAGS = \
-D PKG_DATA_DIR="\"${pkgdatadir}\"" \
-D "BMI_MACHINE_ENDIANNESS_LITTLE" -D "_LINUX"
+EXTRA_DIST = \
+ $(top_srcdir)/InfraStack/OSAgnostic/WiMax/Agents/NDnS/XML_Files/NDnSAgentConfig_forDriver.xml
+
all: all-am
.SUFFIXES:
diff --git a/InfraStack/OSDependent/Linux/OSAL/Makefile.in b/InfraStack/OSDependent/Linux/OSAL/Makefile.in
index 1007f59..8474797 100644
--- a/InfraStack/OSDependent/Linux/OSAL/Makefile.in
+++ b/InfraStack/OSDependent/Linux/OSAL/Makefile.in
@@ -205,7 +205,9 @@ libosal_la_SOURCES = \
$(srcdir)/./Services/wimax_osal_services.c \
$(srcdir)/./Services/wimax_osal_config_controller.c \
$(srcdir)/./Services/wimax_osal_crypt_services.c \
+ $(srcdir)/./Services/wimax_osal_win_config_controller_defines.h \
$(srcdir)/../EventLogMessages/EventLogger.c \
+ $(srcdir)/../EventLogMessages/EventLogger.h \
$(srcdir)/../../../OSAgnostic/OSInterface/OSAL/Primitives/wimax_osal_string.h \
$(srcdir)/../../../OSAgnostic/OSInterface/OSAL/Primitives/wimax_osal_types.h \
$(srcdir)/../../../OSAgnostic/OSInterface/OSAL/Primitives/wimax_osal_primitives.h \
diff --git a/InfraStack/OSDependent/Linux/wimax_utils/wimax_monitor/Makefile.in b/InfraStack/OSDependent/Linux/wimax_utils/wimax_monitor/Makefile.in
index db4a52a..01de0b5 100644
--- a/InfraStack/OSDependent/Linux/wimax_utils/wimax_monitor/Makefile.in
+++ b/InfraStack/OSDependent/Linux/wimax_utils/wimax_monitor/Makefile.in
@@ -194,7 +194,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
wimax_monitor_SOURCES = \
wimax_monitor.c \
- wimax_monitor_utils.c
+ wimax_monitor_utils.c \
+ wimax_monitor_utils.h
wimax_monitor_CFLAGS = \
-I "$(top_srcdir)/InfraStack/OSAgnostic/Common/CommonServices/XmlParser" \
diff --git a/InfraStack/OSDependent/Linux/wimaxcu/Makefile.in b/InfraStack/OSDependent/Linux/wimaxcu/Makefile.in
index d93e7dc..7e59568 100644
--- a/InfraStack/OSDependent/Linux/wimaxcu/Makefile.in
+++ b/InfraStack/OSDependent/Linux/wimaxcu/Makefile.in
@@ -210,7 +210,9 @@ wimaxcu_SOURCES = $(srcdir)/wimaxcu_main.c \
wimaxcu_defs.h \
wimaxcu_util.h
-wimaxcu_CFLAGS = -I "$(top_srcdir)/InfraStack/OSDependent/Linux/InfraStackModules/CommonAPIHeaders/"
+wimaxcu_CFLAGS = -I "$(top_srcdir)/InfraStack/OSDependent/Linux/InfraStackModules/CommonAPIHeaders/" \
+ -I "$(top_builddir)/InfraStack/OSDependent/Linux/InfraStackModules/CommonAPIHeaders/"
+
# -I "$(top_srcdir)/InfraStack/OSDependent/Linux/OSAL/Primitives/"
# -I "$(top_srcdir)/InfraStack/OSDependent/Linux/OSAL/Services/"
diff --git a/Makefile.in b/Makefile.in
index 3472901..0e68b8e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -263,6 +263,7 @@ SUBDIRS = \
man_MANS = $(srcdir)/InfraStack/OSDependent/Linux/manpage/wimaxcu.1 \
$(srcdir)/InfraStack/OSDependent/Linux/manpage/wimaxd.1
+EXTRA_DIST = $(man_MANS)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/configure b/configure
index b51511f..bba3a4a 100755
--- a/configure
+++ b/configure
@@ -11755,13 +11755,15 @@ VER_INFO_BIN=$with_ver_info_bin
curr_dir=`pwd`
-cd $srcdir/InfraStack/OSDependent/Linux/InfraStackModules/CommonAPIHeaders
-ln -sf ../../../../OSAgnostic/OSInterface/OSAL/Primitives/wimax_osal_types.h wimax_osal_types.h
-ln -sf ../../OSAL/Primitives/wimax_osal_basictypes.h wimax_osal_basictypes.h
-ln -sf ../../OSAL/Primitives/wimax_osal_linux_types.h wimax_osal_linux_types.h
-ln -sf ../../OSAL/Primitives/wimax_consts.h wimax_consts.h
-ln -sf ../../OSAL/Primitives/windows_error.h windows_error.h
-ln -sf ../../OSAL/Primitives/wimax_osal_error.h wimax_osal_error.h
+mkdir -p InfraStack/OSDependent/Linux/InfraStackModules/CommonAPIHeaders
+cd InfraStack/OSDependent/Linux/InfraStackModules/CommonAPIHeaders
+ln -sf $ac_abs_confdir/InfraStack/OSAgnostic/OSInterface/OSAL/Primitives/wimax_osal_types.h
+ln -sf $ac_abs_confdir/InfraStack/OSDependent/Linux/OSAL/Primitives/wimax_osal_basictypes.h
+ln -sf $ac_abs_confdir/InfraStack/OSDependent/Linux/OSAL/Primitives/wimax_osal_linux_types.h
+ln -sf $ac_abs_confdir/InfraStack/OSDependent/Linux/OSAL/Primitives/wimax_consts.h
+ln -sf $ac_abs_confdir/InfraStack/OSDependent/Linux/OSAL/Primitives/windows_error.h
+ln -sf $ac_abs_confdir/InfraStack/OSDependent/Linux/OSAL/Primitives/wimax_osal_error.h
+ln -sf $ac_abs_confdir/InfraStack/OSDependent/Linux/OSAL/Services/wimax_osal_win_config_controller_defines.h
cd $curr_dir
ac_config_files="$ac_config_files Makefile wns-version.h InfraStack/OSDependent/Linux/OSAL/Makefile InfraStack/OSDependent/Linux/InfraStackModules/IPCs/Makefile InfraStack/OSAgnostic/Common/CommonServices/Makefile InfraStack/OSAgnostic/Common/CommonServices/XmlParser/Makefile InfraStack/OSAgnostic/Common/L4Common/Makefile InfraStack/OSAgnostic/Product/PipeHandler/Makefile InfraStack/OSAgnostic/WiMax/Agents/NDnS/Makefile InfraStack/OSAgnostic/WiMax/Agents/Supplicant/Makefile InfraStack/OSAgnostic/Product/Instrumantation/Makefile InfraStack/OSAgnostic/Product/Instrumantation/DnDAgent/Makefile InfraStack/OSAgnostic/Product/Instrumantation/MocMsgProxy/Makefile InfraStack/OSAgnostic/Product/AppSrvInfra/Makefile InfraStack/OSAgnostic/WiMax/Wrappers/iWmxSDK/Makefile InfraStack/OSAgnostic/WiMax/Wrappers/iWmxSDK/libiWmxSdk-0.pc InfraStack/OSAgnostic/WiMax/Wrappers/iWmxSDK/libiWmxSdk-0-uninstalled.pc InfraStack/OSDependent/Linux/wimaxcu/Makefile InfraStack/OSDependent/Linux/wimax_utils/wimax_monitor/Makefile"