fixed incorrect EXTRA_DIST
authorVictor Kirhenshtein <victor@netxms.org>
Wed, 30 Sep 2009 17:38:36 +0000 (17:38 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Wed, 30 Sep 2009 17:38:36 +0000 (17:38 +0000)
.gitattributes
Makefile.am
configure.ac
include/Makefile.am
src/server/Makefile.am
src/server/include/Makefile.am [copied from src/server/Makefile.am with 60% similarity]

index 08f17c6..c18167d 100644 (file)
@@ -621,6 +621,7 @@ src/server/dbdrv/odbc/odbc.vcproj -text
 src/server/dbdrv/oracle/oracle.vcproj -text
 src/server/dbdrv/pgsql/pgsql.vcproj -text
 src/server/dbdrv/sqlite/sqlite.vcproj -text
+src/server/include/Makefile.am -text
 src/server/libnxsrv/libnxsrv.vcproj -text
 src/server/netxmsd/netxmsd.vcproj -text
 src/server/smsdrv/generic/generic.vcproj -text
index 2e688af..e67ca08 100644 (file)
@@ -9,8 +9,8 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = reconf configure include netxms.dsw Makefile.nw README.HPUX
-SUBDIRS = m4 contrib src doc tools netware
+EXTRA_DIST = reconf configure netxms.sln Makefile.nw README.HPUX
+SUBDIRS = m4 contrib include src doc tools netware
 SUBDIRS += @TOP_LEVEL_MODULES@
 
 install-exec-hook:
index e20eda2..400c5e3 100644 (file)
@@ -1547,7 +1547,6 @@ AC_CONFIG_FILES([
        src/nxscript/Makefile
        src/server/Makefile
        src/server/core/Makefile
-       src/server/netxmsd/Makefile
        src/server/dbdrv/Makefile
        src/server/dbdrv/odbc/Makefile
        src/server/dbdrv/mssql/Makefile
@@ -1555,6 +1554,9 @@ AC_CONFIG_FILES([
        src/server/dbdrv/pgsql/Makefile
        src/server/dbdrv/sqlite/Makefile
        src/server/dbdrv/oracle/Makefile
+       src/server/include/Makefile
+       src/server/libnxsrv/Makefile
+       src/server/netxmsd/Makefile
        src/server/smsdrv/Makefile
        src/server/smsdrv/generic/Makefile
        src/server/smsdrv/nxagent/Makefile
@@ -1566,7 +1568,6 @@ AC_CONFIG_FILES([
        src/server/tools/nxconfig/res/Makefile
        src/server/tools/nxdbmgr/Makefile
        src/server/tools/nxupload/Makefile
-       src/server/libnxsrv/Makefile
        src/snmp/Makefile
        src/snmp/libnxsnmp/Makefile
        src/snmp/nxmibc/Makefile
index e69de29..e8a9c7b 100644 (file)
@@ -0,0 +1,47 @@
+# Copyright (C) 2004 NetXMS Team <bugs@netxms.org>
+#  
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without 
+# modifications, as long as this notice is preserved.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+
+EXTRA_DIST = \
+       ata.h \
+       base64.h \
+       config-netware.h \
+       FlexLexer.h \
+       geolocation.h \
+       netxmsdb.h \
+       netxms_getopt.h \
+       netxms_isc.h \
+       netxms_maps.h \
+       netxms-regex.h \
+       netxms-version.h \
+       nms_agent.h \
+       nms_common.h \
+       nms_cscp.h \
+       nms_threads.h \
+       nms_util.h \
+       nxclapi.h \
+       nxconfig.h \
+       nxcpapi.h \
+       nxevent.h \
+       nxlexer_styles.h \
+       nxlog.h \
+       nxlpapi.h \
+       nxmbapi.h \
+       nxnt.h \
+       nxqueue.h \
+       nxsl_classes.h \
+       nxsl.h \
+       nxsm_ext.h \
+       nxsnmp.h \
+       nxtools.h \
+       nxwinui.h \
+       rwlock.h \
+       unicode.h \
+       uuid.h
index 64d4184..0cae0be 100644 (file)
@@ -8,5 +8,4 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-EXTRA_DIST = include
-SUBDIRS = libnxsrv core netxmsd dbdrv tools smsdrv
+SUBDIRS = include libnxsrv core netxmsd dbdrv tools smsdrv
similarity index 60%
copy from src/server/Makefile.am
copy to src/server/include/Makefile.am
index 64d4184..0a71872 100644 (file)
@@ -8,5 +8,23 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-EXTRA_DIST = include
-SUBDIRS = libnxsrv core netxmsd dbdrv tools smsdrv
+EXTRA_DIST = \
+       dbdrv.h \
+       local_admin.h \
+       nms_actions.h \
+       nms_alarm.h \
+       nms_core.h \
+       nms_dcoll.h \
+       nms_events.h \
+       nms_locks.h \
+       nms_objects.h \
+       nms_pkg.h \
+       nms_script.h \
+       nms_topo.h \
+       nms_users.h \
+       nxcore_jobs.h \
+       nxcore_logs.h \
+       nxcore_maps.h \
+       nxcore_situations.h \
+       nxmodule.h \
+       nxsrvapi.h