preparation step for "make dist"; looks like working.
authorAlex Kirhenshtein <alk@netxms.org>
Fri, 15 Oct 2004 19:34:07 +0000 (19:34 +0000)
committerAlex Kirhenshtein <alk@netxms.org>
Fri, 15 Oct 2004 19:34:07 +0000 (19:34 +0000)
"make dist" steps:
checkout
./reconf
./configure --with-dist
make dist

nb: with-dist enable _all_ agents/db drivers, don't ever try to compile it

41 files changed:
.gitattributes
Makefile.am
configure.ac
contrib/Makefile.am [copied from src/agent/subagents/Makefile.am with 90% similarity]
contrib/dct/Makefile.am [copied from src/agent/subagents/Makefile.am with 90% similarity]
contrib/startup/Makefile.am [copied from doc/Makefile.am with 96% similarity]
contrib/startup/redhat/Makefile.am [copied from doc/Makefile.am with 95% similarity]
doc/Makefile.am
images/Makefile.am [copied from src/agent/subagents/Makefile.am with 56% similarity]
netware/Makefile.am [copied from src/server/tools/Makefile.am with 93% similarity]
sql/Makefile.am
sql/upgrade/Makefile.am [copied from src/agent/subagents/Makefile.am with 87% similarity]
src/Makefile.am
src/README.libs
src/agent/core/Makefile.am
src/agent/subagents/Makefile.am
src/agent/subagents/freebsd/Makefile.am [new file with mode: 0644]
src/agent/subagents/netware/Makefile.am [copied from src/agent/subagents/Makefile.am with 87% similarity]
src/agent/subagents/sunos/Makefile.am [new file with mode: 0644]
src/agent/subagents/winperf/Makefile.am [copied from src/agent/subagents/Makefile.am with 83% similarity]
src/console/Makefile.am [copied from src/server/tools/Makefile.am with 94% similarity]
src/console/cmdline/Makefile.am [new file with mode: 0644]
src/console/cmdline/cmdline.cpp
src/console/cmdline/main.cpp
src/console/win32/Makefile.am [new file with mode: 0644]
src/console/win32/icons/Makefile.am [new file with mode: 0644]
src/console/win32/res/Makefile.am [copied from src/agent/subagents/Makefile.am with 81% similarity]
src/console/win32starter/Makefile.am [copied from src/agent/subagents/Makefile.am with 85% similarity]
src/libnetxms/Makefile.am
src/libnxcl/Makefile.am
src/nxevent/Makefile.am [copied from src/agent/subagents/Makefile.am with 87% similarity]
src/server/core/Makefile.am
src/server/dbdrv/mssql/Makefile.am [new file with mode: 0644]
src/server/dbdrv/mysql/Makefile.am
src/server/dbdrv/odbc/Makefile.am
src/server/dbdrv/pgsql/Makefile.am
src/server/libnxsrv/Makefile.am
src/server/tools/Makefile.am
src/server/tools/nxaction/Makefile.am
src/server/tools/nxadm/Makefile.am [new file with mode: 0644]
src/server/tools/nxget/Makefile.am

index b790c8a..4433fb1 100644 (file)
 /THANKS -text
 /TODO -text
 /configure.ac -text
+contrib/Makefile.am -text
+contrib/dct/Makefile.am -text
 contrib/dct/generic_agent.dct -text
 contrib/dct/generic_object.dct -text
 contrib/logo.jpg -text
+contrib/startup/Makefile.am -text
+contrib/startup/redhat/Makefile.am -text
 contrib/startup/redhat/netxmsd -text
 doc/Makefile.am -text
 doc/admin_guide.doc -text
 doc/internals.rtf -text
 doc/libnxcl-pg.doc -text
+images/Makefile.am -text
 images/generic_printer.ico -text
 images/generic_printer.png -text
 images/interface.ico -text
@@ -57,6 +62,7 @@ include/nxnt.h -text
 include/nxqueue.h -text
 include/unicode.h -text
 m4/Makefile.am -text
+netware/Makefile.am -text
 netware/Makefile.inc -text
 netware/bin/.keep -text
 /reconf -text
@@ -73,6 +79,7 @@ sql/setup.in -text
 sql/upgrade/00100011.nxdb -text
 sql/upgrade/00110012.nxdb -text
 sql/upgrade/00120013.nxdb -text
+sql/upgrade/Makefile.am -text
 sql/upgrade/common.nxdb -text
 src/Makefile.am -text
 src/PPC_libs.vcw -text
@@ -103,8 +110,10 @@ src/agent/core/sysinfo.cpp -text
 src/agent/core/tools.cpp -text
 src/agent/core/win32.cpp -text
 src/agent/subagents/Makefile.am -text
+src/agent/subagents/freebsd/Makefile.am -text
 src/agent/subagents/linux/Makefile.am -text
 src/agent/subagents/linux/linux.cpp -text
+src/agent/subagents/netware/Makefile.am -text
 src/agent/subagents/netware/Makefile.nw -text
 src/agent/subagents/netware/netware.cpp -text
 src/agent/subagents/netware/netware.def -text
@@ -113,12 +122,16 @@ src/agent/subagents/skeleton/Makefile.nw -text
 src/agent/subagents/skeleton/skeleton.cpp -text
 src/agent/subagents/skeleton/skeleton.dsp -text
 src/agent/subagents/skeleton/skeleton.dsw -text
+src/agent/subagents/sunos/Makefile.am -text
+src/agent/subagents/winperf/Makefile.am -text
 src/agent/subagents/winperf/collect.cpp -text
 src/agent/subagents/winperf/tools.cpp -text
 src/agent/subagents/winperf/winperf.cpp -text
 src/agent/subagents/winperf/winperf.dsp -text
 src/agent/subagents/winperf/winperf.dsw -text
 src/agent/subagents/winperf/winperf.h -text
+src/console/Makefile.am -text
+src/console/cmdline/Makefile.am -text
 src/console/cmdline/cmdline.cpp -text
 src/console/cmdline/main.cpp -text
 src/console/cmdline/nxcmd.dsp -text
@@ -182,6 +195,7 @@ src/console/win32/MIBBrowserDlg.cpp -text
 src/console/win32/MIBBrowserDlg.h -text
 src/console/win32/MainFrm.cpp -text
 src/console/win32/MainFrm.h -text
+src/console/win32/Makefile.am -text
 src/console/win32/MapFrame.cpp -text
 src/console/win32/MapFrame.h -text
 src/console/win32/MapView.cpp -text
@@ -249,6 +263,7 @@ src/console/win32/draw.cpp -text
 src/console/win32/globals.cpp -text
 src/console/win32/globals.h -text
 src/console/win32/icons/EARTH.ICO -text
+src/console/win32/icons/Makefile.am -text
 src/console/win32/icons/RuleManager.ico -text
 src/console/win32/icons/SeverityCritical.ico -text
 src/console/win32/icons/SeverityMajor.ico -text
@@ -291,6 +306,7 @@ src/console/win32/nxcon.dsp -text
 src/console/win32/nxcon.dsw -text
 src/console/win32/nxcon.h -text
 src/console/win32/nxcon.rc -text
+src/console/win32/res/Makefile.am -text
 src/console/win32/res/Toolbar.bmp -text
 src/console/win32/res/any.bmp -text
 src/console/win32/res/down_arrow.bmp -text
@@ -301,6 +317,7 @@ src/console/win32/res/nxcon.rc2 -text
 src/console/win32/res/up_arrow.bmp -text
 src/console/win32/resource.h -text
 src/console/win32/tools.cpp -text
+src/console/win32starter/Makefile.am -text
 src/console/win32starter/nxcstart.cpp -text
 src/console/win32starter/nxcstart.dsp -text
 src/console/win32starter/nxcstart.dsw -text
@@ -349,6 +366,7 @@ src/libnxcl/mib.cpp -text
 src/libnxcl/misc.cpp -text
 src/libnxcl/objects.cpp -text
 src/libnxcl/users.cpp -text
+src/nxevent/Makefile.am -text
 src/nxevent/nxevent.cpp -text
 src/nxevent/nxevent.dsp -text
 src/nxevent/nxevent.dsw -text
@@ -415,6 +433,7 @@ src/server/core/users.cpp -text
 src/server/core/watchdog.cpp -text
 src/server/core/winsrv.cpp -text
 src/server/dbdrv/Makefile.am -text
+src/server/dbdrv/mssql/Makefile.am -text
 src/server/dbdrv/mssql/mssql.cpp -text
 src/server/dbdrv/mssql/mssql.dsp -text
 src/server/dbdrv/mssql/mssql.dsw -text
@@ -450,6 +469,7 @@ src/server/tools/nxaction/Makefile.am -text
 src/server/tools/nxaction/nxaction.cpp -text
 src/server/tools/nxaction/nxaction.dsp -text
 src/server/tools/nxaction/nxaction.dsw -text
+src/server/tools/nxadm/Makefile.am -text
 src/server/tools/nxadm/comm.cpp -text
 src/server/tools/nxadm/nxadm.cpp -text
 src/server/tools/nxadm/nxadm.dsp -text
index 0cf8683..4f5904a 100644 (file)
@@ -9,4 +9,4 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 EXTRA_DIST = reconf configure include
-SUBDIRS = m4 src doc sql
+SUBDIRS = m4 contrib src doc sql images tools netware
index 5b83a83..62db719 100644 (file)
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.29 2004-10-13 10:24:37 victor Exp $
+# $Id: configure.ac,v 1.30 2004-10-15 19:32:50 alk Exp $
 #
 # Process this file with autoconf to produce a configure script.
 #
@@ -25,10 +25,10 @@ if test -d /usr/kerberos/include; then
        CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
 fi
 
-if test -d /usr/local/ssl/include; then
-       CFLAGS="$CFLAGS -I/usr/local/ssl/include"
-       CPPFLAGS="$CPPFLAGS -I/usr/local/ssl/include"
-fi
+#if test -d /usr/local/ssl/include; then
+#      CFLAGS="$CFLAGS -I/usr/local/ssl/include"
+#      CPPFLAGS="$CPPFLAGS -I/usr/local/ssl/include"
+#fi
 
 if test -d /usr/local/lib; then
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
@@ -108,22 +108,18 @@ AC_ARG_WITH(pgsql,
        AC_MSG_RESULT(yes)
 fi ])
 
-AC_SUBST(DB_DRIVERS)
-
-
-
 AC_ARG_WITH(server,
 [AS_HELP_STRING(--with-server,build server)],
 [
        MODULES="$MODULES server"
 ])
-AC_SUBST(MODULES)
 
 
 SUBAGENT_DIRS=""
 AC_ARG_WITH(agent,
 [AS_HELP_STRING(--with-agent,build agent)],
 [
+       MODULES="$MODULES agent"
        case `uname -s` in
                Linux)
                        SUBAGENT_DIRS="linux"
@@ -139,6 +135,16 @@ AC_ARG_WITH(agent,
                        ;;
        esac
 ])
+
+AC_ARG_WITH(dist,
+[AS_HELP_STRING(--with-dist,for maintainers only)],
+       DB_DRIVERS="mysql pgsql odbc mssql"
+       MODULES="server agent"
+       SUBAGENT_DIRS="linux freebsd sunos"
+)
+
+AC_SUBST(DB_DRIVERS)
+AC_SUBST(MODULES)
 AC_SUBST(SUBAGENT_DIRS)
 
 
@@ -158,8 +164,8 @@ AC_PROG_LIBTOOL
 #AC_CHECK_LIB([socket], [socket])
 #AC_CHECK_LIB([nsl], [gethostbyname])
 
-AC_CHECK_LIB(crypto, DH_new)
-AC_CHECK_LIB(ssl, SSL_accept)
+#AC_CHECK_LIB(crypto, DH_new)
+#AC_CHECK_LIB(ssl, SSL_accept)
 AC_CHECK_LIB(termcap, tgetstr, [], [AC_CHECK_LIB(ncurses, tgetstr, [], AC_CHECK_LIB(curses, tgetstr))])
 AC_CHECK_LIB(readline, readline)
 AC_CHECK_LIB(socket, if_nameindex)
@@ -174,15 +180,15 @@ AC_CHECK_HEADERS([sys/int_types.h])
 AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h sys/socket.h])
 AC_CHECK_HEADERS([sys/ioctl.h sys/sockio.h])
 AC_CHECK_HEADERS([net/if.h net/if_arp.h net/if_dl.h])
-AC_CHECK_HEADERS([openssl/ssl.h])
+#AC_CHECK_HEADERS([openssl/ssl.h])
 AC_CHECK_HEADERS([readline/readline.h])
 AC_CHECK_HEADERS([byteswap.h])
 AC_CHECK_HEADERS([sys/mman.h])
 AC_CHECK_HEADERS([sys/utsname.h])
 
-if test "x$ac_cv_header_openssl_ssl_h" != "xyes" ; then
-       AC_MSG_ERROR(OpenSSL headers not found.)
-fi
+#if test "x$ac_cv_header_openssl_ssl_h" != "xyes" ; then
+#      AC_MSG_ERROR(OpenSSL headers not found.)
+#fi
 
 # --------------------------------------------------------------------------
 # types
@@ -348,30 +354,52 @@ AC_SUBST(DBDRV_LIBRARY_VERSION)
 # --------------------------------------------------------------------------
 
 AC_CONFIG_FILES([
-   Makefile
    README
-   doc/Makefile
-   m4/Makefile
-   sql/Makefile
-   include/Makefile
-   src/Makefile
-   src/libnetxms/Makefile
-   src/libnxcscp/Makefile
-   src/libnxcl/Makefile
-   src/server/Makefile
-   src/server/libnxsrv/Makefile
-   src/server/core/Makefile
-   src/server/tools/Makefile
-   src/server/tools/nxget/Makefile
-   src/server/tools/nxaction/Makefile
-   src/server/dbdrv/Makefile
-   src/server/dbdrv/mysql/Makefile
-   src/server/dbdrv/pgsql/Makefile
-   src/agent/Makefile
-   src/agent/core/Makefile
-   src/agent/subagents/Makefile
-   src/agent/subagents/skeleton/Makefile
-   src/agent/subagents/linux/Makefile
+       Makefile
+       contrib/Makefile
+       contrib/config/Makefile
+       contrib/dct/Makefile
+       contrib/startup/Makefile
+       contrib/startup/redhat/Makefile
+       doc/Makefile
+       images/Makefile
+       include/Makefile
+       m4/Makefile
+       netware/Makefile
+       sql/Makefile
+       sql/upgrade/Makefile
+       src/Makefile
+       src/libnetxms/Makefile
+       src/libnxcscp/Makefile
+       src/libnxcl/Makefile
+       src/console/Makefile
+       src/console/win32/Makefile
+       src/console/win32/icons/Makefile
+       src/console/win32/res/Makefile
+       src/console/win32starter/Makefile
+       src/nxevent/Makefile
+       src/server/Makefile
+       src/server/core/Makefile
+       src/server/dbdrv/Makefile
+       src/server/dbdrv/odbc/Makefile
+       src/server/dbdrv/mssql/Makefile
+       src/server/dbdrv/mysql/Makefile
+       src/server/dbdrv/pgsql/Makefile
+       src/server/tools/Makefile
+       src/server/tools/nxget/Makefile
+       src/server/tools/nxaction/Makefile
+       src/server/tools/nxadm/Makefile
+       src/server/libnxsrv/Makefile
+       src/agent/Makefile
+       src/agent/core/Makefile
+       src/agent/subagents/Makefile
+       src/agent/subagents/linux/Makefile
+       src/agent/subagents/sunos/Makefile
+       src/agent/subagents/skeleton/Makefile
+       src/agent/subagents/freebsd/Makefile
+       src/agent/subagents/netware/Makefile
+       src/agent/subagents/winperf/Makefile
+       tools/Makefile
 ])
 
 AC_OUTPUT
similarity index 90%
copy from src/agent/subagents/Makefile.am
copy to contrib/Makefile.am
index 3e63ab8..a00fc10 100644 (file)
@@ -8,4 +8,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-SUBDIRS = skeleton ${SUBAGENT_DIRS}
+
+EXTRA_DIST = logo.jpg
+SUBDIRS= config dct startup
similarity index 90%
copy from src/agent/subagents/Makefile.am
copy to contrib/dct/Makefile.am
index 3e63ab8..b546605 100644 (file)
@@ -8,4 +8,5 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-SUBDIRS = skeleton ${SUBAGENT_DIRS}
+
+EXTRA_DIST = generic_agent.dct generic_object.dct
similarity index 96%
copy from doc/Makefile.am
copy to contrib/startup/Makefile.am
index ae9d38f..9225fa0 100644 (file)
@@ -8,3 +8,5 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+
+SUBDIRS= redhat
similarity index 95%
copy from doc/Makefile.am
copy to contrib/startup/redhat/Makefile.am
index ae9d38f..da63a4c 100644 (file)
@@ -8,3 +8,5 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+
+EXTRA_DIST = netxmsd
index ae9d38f..e7ea80d 100644 (file)
@@ -8,3 +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 = admin_guide.doc libnxcl-pg.doc
similarity index 56%
copy from src/agent/subagents/Makefile.am
copy to images/Makefile.am
index 3e63ab8..5a53af6 100644 (file)
@@ -8,4 +8,14 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-SUBDIRS = skeleton ${SUBAGENT_DIRS}
+EXTRA_DIST = \
+    generic_printer.ico generic_printer.png \
+    interface.ico interface.png \
+    network.ico network.png \
+    node_group.ico node_group.png \
+    node.ico node.png \
+    service.ico service.png \
+    subnet.ico subnet.png \
+    template_group.ico template_group.png \
+    template.ico template.png \
+    template_root.ico template_root.png
similarity index 93%
copy from src/server/tools/Makefile.am
copy to netware/Makefile.am
index 1f7fc4c..2f6a04f 100644 (file)
@@ -8,4 +8,5 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-SUBDIRS = nxget nxaction
+EXTRA_DIST = \
+    Makefile.inc
index 217dd31..f659090 100644 (file)
@@ -2,6 +2,8 @@
 # Makefile for SQL scripts
 #
 
+SUBDIRS=upgrade
+
 sqldir=$(pkgdatadir)/sql
 
 sql_SCRIPTS = dbinit_mysql.sql dbinit_pgsql.sql dbinit_mssql.sql
@@ -26,4 +28,7 @@ dbinit_mssql.sql: $(SOURCE) $(HEADER_FILES)
 clean:
        rm -f dbinit_*.sql
 
-EXTRA_DIST = $(sql_SCRIPTS)
+EXTRA_DIST = \
+       $(sql_SCRIPTS) \
+       dbinit.in events.in images.in \
+       policy.in schema.in setup.in
similarity index 87%
copy from src/agent/subagents/Makefile.am
copy to sql/upgrade/Makefile.am
index 3e63ab8..eae70da 100644 (file)
@@ -8,4 +8,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-SUBDIRS = skeleton ${SUBAGENT_DIRS}
+EXTRA_DIST = \
+    common.nxdb \
+    00100011.nxdb 00110012.nxdb
index f26007d..04d8b45 100644 (file)
@@ -8,4 +8,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-SUBDIRS = libnetxms libnxcscp server libnxcl agent
+SUBDIRS = libnetxms libnxcscp libnxcl console nxevent
+SUBDIRS += @MODULES@
+EXTRA_DIST = PPC_libs.vcw WIN32_libs.sln
index 63f0f37..cc8cab5 100644 (file)
@@ -3,4 +3,4 @@ build order:
        libnxcscp
        libnxcl
 
-WIN32_libs.sln (VC7) or PPC_libs.vcw (eVC4) can be used instead
+WIN32_libs.sln (VC7) or PPC_libs.vcw (eVC4) can be used
index edfa8ea..0cd45e4 100644 (file)
@@ -1,8 +1,18 @@
+EXTRA_DIST = \
+    Makefile.nw nxagentd.def \
+    nxagentd.dsw nxagentd.dsp \
+    messages.mc \
+    nxagentd.rc \
+    win32.cpp resource.h \
+        nxagentd.h
+
 INCLUDES=-I@top_srcdir@/include
 
 bin_PROGRAMS = nxagentd
 nxagentd_SOURCES = messages.c actions.cpp comm.cpp exec.cpp getparam.cpp log.cpp nxagentd.cpp session.cpp subagent.cpp sysinfo.cpp tools.cpp
 nxagentd_LDADD = @PTHREAD_LIBS@ ../../libnetxms/libnetxms.la ../../libnxcscp/libnxcscp.la
 
-messages.c: messages.mc
+messages.c: messages.h
+
+messages.h: messages.mc
        $(PERL) @top_builddir@/tools/mc.pl $<
index 3e63ab8..89c8e88 100644 (file)
@@ -8,4 +8,4 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-SUBDIRS = skeleton ${SUBAGENT_DIRS}
+SUBDIRS = skeleton winperf netware ${SUBAGENT_DIRS}
diff --git a/src/agent/subagents/freebsd/Makefile.am b/src/agent/subagents/freebsd/Makefile.am
new file mode 100644 (file)
index 0000000..ae169de
--- /dev/null
@@ -0,0 +1,4 @@
+INCLUDES=-I@top_srcdir@/include
+
+#lib_LTLIBRARIES = libnsm_linux.la
+#libnsm_linux_la_SOURCES = linux.cpp
similarity index 87%
copy from src/agent/subagents/Makefile.am
copy to src/agent/subagents/netware/Makefile.am
index 3e63ab8..de12794 100644 (file)
@@ -8,4 +8,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-SUBDIRS = skeleton ${SUBAGENT_DIRS}
+EXTRA_DIST = \
+    Makefile.nw \
+    netware.def \
+    netware.cpp
diff --git a/src/agent/subagents/sunos/Makefile.am b/src/agent/subagents/sunos/Makefile.am
new file mode 100644 (file)
index 0000000..ae169de
--- /dev/null
@@ -0,0 +1,4 @@
+INCLUDES=-I@top_srcdir@/include
+
+#lib_LTLIBRARIES = libnsm_linux.la
+#libnsm_linux_la_SOURCES = linux.cpp
similarity index 83%
copy from src/agent/subagents/Makefile.am
copy to src/agent/subagents/winperf/Makefile.am
index 3e63ab8..006d42a 100644 (file)
@@ -8,4 +8,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-SUBDIRS = skeleton ${SUBAGENT_DIRS}
+EXTRA_DIST = \
+    collect.cpp tools.cpp winperf.cpp winperf.h \
+    winperf.dsp winperf.dsw
similarity index 94%
copy from src/server/tools/Makefile.am
copy to src/console/Makefile.am
index 1f7fc4c..b0150ab 100644 (file)
@@ -8,4 +8,4 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-SUBDIRS = nxget nxaction
+SUBDIRS = win32 win32starter
diff --git a/src/console/cmdline/Makefile.am b/src/console/cmdline/Makefile.am
new file mode 100644 (file)
index 0000000..0bb5e2b
--- /dev/null
@@ -0,0 +1,7 @@
+INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
+
+bin_PROGRAMS = nxcmd
+nxcmd_SOURCES = main.cpp cmdline.cpp
+nxcmd_LDADD = @PTHREAD_LIBS@ -ldl ../../libnetxms/libnetxms.la ../../libnxcscp/libnxcscp.la ../../libnxcl/libnxcl.la
+
+EXTRA_DIST = nxcmd.dsp nxcmd.dsw
index d2b5448..572ae7b 100644 (file)
@@ -22,6 +22,7 @@
 **/
 
 #include "nxcmd.h"
+#include <string.h>
 
 
 //
index 683cb66..5336550 100644 (file)
@@ -23,6 +23,8 @@
 
 #include "nxcmd.h"
 
+#include <string.h>
+
 
 //
 // Global variables
diff --git a/src/console/win32/Makefile.am b/src/console/win32/Makefile.am
new file mode 100644 (file)
index 0000000..3a405c5
--- /dev/null
@@ -0,0 +1,80 @@
+# 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.
+
+SUBDIRS = res icons
+EXTRA_DIST = \
+       ActionEditor.cpp ActionEditor.h ActionSelDlg.cpp ActionSelDlg.h \
+       AlarmBrowser.cpp AlarmBrowser.h \
+       comm.cpp \
+       ConsolePropsGeneral.cpp ConsolePropsGeneral.h \
+       ControlPanel.cpp ControlPanel.h \
+       CreateContainerDlg.cpp CreateContainerDlg.h \
+       CreateNodeDlg.cpp CreateNodeDlg.h \
+       CreateObjectDlg.cpp CreateObjectDlg.h \
+       CreateTemplateDlg.cpp CreateTemplateDlg.h \
+       CreateTGDlg.cpp CreateTGDlg.h \
+       DataCollectionEditor.cpp DataCollectionEditor.h \
+       DCIDataView.cpp DCIDataView.h \
+       DCIPropPage.cpp DCIPropPage.h \
+       DCIThresholdsPage.cpp DCIThresholdsPage.h \
+       DCITransformPage.cpp DCITransformPage.h \
+       DebugFrame.cpp DebugFrame.h \
+       draw.cpp \
+       EditActionDlg.cpp EditActionDlg.h \
+       EditBox.cpp EditBox.h \
+       EditEventDlg.cpp EditEventDlg.h \
+       EventBrowser.cpp EventBrowser.h \
+       EventEditor.cpp EventEditor.h \
+       EventPolicyEditor.cpp EventPolicyEditor.h \
+       EventSelDlg.cpp EventSelDlg.h \
+       globals.cpp globals.h \
+       Graph.cpp \
+       GraphFrame.cpp GraphFrame.h \
+       Graph.h \
+       GroupPropDlg.cpp GroupPropDlg.h \
+       LoginDialog.cpp LoginDialog.h \
+       MainFrm.cpp MainFrm.h \
+       MapFrame.cpp MapFrame.h \
+       MapView.cpp MapView.h \
+       MIBBrowserDlg.cpp MIBBrowserDlg.h \
+       NetSummaryFrame.cpp NetSummaryFrame.h \
+       NewActionDlg.cpp NewActionDlg.h \
+       NewUserDlg.cpp NewUserDlg.h \
+       NodePoller.cpp NodePoller.h \
+       NodePropsGeneral.cpp NodePropsGeneral.h \
+       NodeSummary.cpp NodeSummary.h \
+       nxcon.clw nxcon.dsp nxcon.dsw \
+       nxcon.cpp nxcon.h \
+       nxcon.rc \
+       ObjectBrowser.cpp ObjectBrowser.h \
+       ObjectInfoBox.cpp ObjectInfoBox.h \
+       ObjectPreview.cpp ObjectPreview.h \
+       ObjectPropCaps.cpp ObjectPropCaps.h \
+       ObjectPropsGeneral.cpp ObjectPropsGeneral.h \
+       ObjectPropSheet.cpp ObjectPropSheet.h \
+       ObjectPropsPresentation.cpp ObjectPropsPresentation.h \
+       ObjectPropsSecurity.cpp ObjectPropsSecurity.h \
+       ObjectSearchBox.cpp ObjectSearchBox.h \
+       ObjectSelDlg.cpp ObjectSelDlg.h \
+       PasswordChangeDlg.cpp PasswordChangeDlg.h \
+       RequestProcessingDlg.cpp RequestProcessingDlg.h \
+       resource.h \
+       RuleAlarmDlg.cpp RuleAlarmDlg.h \
+       RuleCommentDlg.cpp RuleCommentDlg.h \
+       RuleHeader.cpp RuleHeader.h \
+       RuleList.cpp RuleList.h \
+       RuleSeverityDlg.cpp RuleSeverityDlg.h \
+       StdAfx.cpp StdAfx.h \
+       ThresholdDlg.cpp ThresholdDlg.h \
+       ToolBox.cpp ToolBox.h \
+       tools.cpp \
+       UserEditor.cpp UserEditor.h \
+       UserPropDlg.cpp UserPropDlg.h \
+       UserSelectDlg.cpp UserSelectDlg.h
diff --git a/src/console/win32/icons/Makefile.am b/src/console/win32/icons/Makefile.am
new file mode 100644 (file)
index 0000000..ea5f0be
--- /dev/null
@@ -0,0 +1,20 @@
+# 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 = \
+       ack.ico active.ico alarm.ico connect.ico datacoll.ico \
+       dctemplate.ico disabled.ico EARTH.ICO e-mail.ico exec.ico \
+       graph.ico log.ico NetMap.ICO ovl_status_critical.ico \
+       ovl_status_disabled.ico ovl_status_major.ico ovl_status_minor.ico \
+       ovl_status_testing.ico ovl_status_unknown.ico ovl_status_unmanaged.ico \
+       ovl_status_warning.ico passwd.ico question.ico rexec.ico RuleManager.ico \
+       setup.ico SeverityCritical.ico SeverityMajor.ico SeverityMinor.ico \
+       SeverityNormal.ico SeverityWarning.ico sms.ico sortdown.ico \
+       sort_up.ico tree.ico unsupported.ico user.ico users.ico
similarity index 81%
copy from src/agent/subagents/Makefile.am
copy to src/console/win32/res/Makefile.am
index 3e63ab8..07c67ae 100644 (file)
@@ -8,4 +8,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-SUBDIRS = skeleton ${SUBAGENT_DIRS}
+EXTRA_DIST = \
+       any.bmp down_arrow.bmp login.bmp none.bmp \
+       nxcon.ico nxcon.rc2 Toolbar.bmp up_arrow.bmp
similarity index 85%
copy from src/agent/subagents/Makefile.am
copy to src/console/win32starter/Makefile.am
index 3e63ab8..2b04b05 100644 (file)
@@ -8,4 +8,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-SUBDIRS = skeleton ${SUBAGENT_DIRS}
+EXTRA_DIST = \
+       nxcstart.dsp nxcstart.dsw \
+       nxcstart.cpp nxcstart.rc resource.h
index 99e92a1..ae30621 100644 (file)
@@ -3,3 +3,9 @@ INCLUDES=-I@top_srcdir@/include
 lib_LTLIBRARIES = libnetxms.la
 libnetxms_la_SOURCES = config.cpp dload.cpp hash.cpp icmp.cpp inline.cpp main.cpp md5.cpp sha1.cpp strtoll.c strtoull.c tools.cpp unicode.cpp
 libnetxms_la_LDFLAGS = -version-info $(LIBNETXMS_LIBRARY_VERSION)
+
+EXTRA_DIST = \
+       libnetxms.dsp libnetxms.dsw \
+       libnetxms.vcp libnetxms.vcw \
+       Makefile.nw netxms.def \
+       libnetxms.h md5.h sha1.h
index ff2c1e4..70d9885 100644 (file)
@@ -3,3 +3,8 @@ INCLUDES=-I@top_srcdir@/include
 lib_LTLIBRARIES = libnxcl.la
 libnxcl_la_SOURCES = actions.cpp alarms.cpp comm.cpp eventdb.cpp events.cpp image.cpp main.cpp misc.cpp objects.cpp
 libnxcl_la_LDFLAGS = -version-info $(LIBNETXMS_LIBRARY_VERSION)
+
+EXTRA_DIST = \
+       libnxcl.dsp libnxcl.dsw \
+       libnxcl.vcp libnxcl.vcw \
+       libnxcl.h
similarity index 87%
copy from src/agent/subagents/Makefile.am
copy to src/nxevent/Makefile.am
index 3e63ab8..549bf03 100644 (file)
@@ -8,4 +8,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-SUBDIRS = skeleton ${SUBAGENT_DIRS}
+EXTRA_DIST = \
+       nxevent.cpp nxevent.h \
+       nxevent.dsp nxevent.dsw
index b1f40a5..1245259 100644 (file)
@@ -4,5 +4,14 @@ bin_PROGRAMS = netxmsd
 netxmsd_SOURCES = messages.c acl.cpp actions.cpp admin.cpp alarm.cpp client.cpp config.cpp container.cpp datacoll.cpp db.cpp dbwrite.cpp dcitem.cpp dcithreshold.cpp dcivalue.cpp debug.cpp discovery.cpp email.cpp entirenet.cpp epp.cpp events.cpp evproc.cpp hk.cpp id.cpp image.cpp interface.cpp locks.cpp log.cpp main.cpp netinfo.cpp netobj.cpp node.cpp nortel.cpp np.cpp objects.cpp rootobj.cpp session.cpp snmp.cpp status.cpp subnet.cpp syncer.cpp template.cpp tools.cpp uniroot.cpp users.cpp watchdog.cpp winsrv.cpp
 netxmsd_LDADD = @PTHREAD_LIBS@ ../../libnetxms/libnetxms.la ../../libnxcscp/libnxcscp.la ../libnxsrv/libnxsrv.la -lsnmp
 
-messages.c: messages.mc
+messages.c: messages.h
+
+messages.h: messages.mc
        $(PERL) @top_builddir@/tools/mc.pl $<
+
+EXTRA_DIST = \
+       netxmsd.dsp netxmsd.dsw \
+       messages.mc \
+       nms_actions.h nms_alarm.h nms_core.h \
+       nms_dcoll.h nms_events.h nms_locks.h \
+       nms_objects.h nms_users.h resource.h
diff --git a/src/server/dbdrv/mssql/Makefile.am b/src/server/dbdrv/mssql/Makefile.am
new file mode 100644 (file)
index 0000000..32b0423
--- /dev/null
@@ -0,0 +1,3 @@
+EXTRA_DIST = \
+    mssql.cpp mssqldrv.h \
+    mssql.dsp mssql.dsw
\ No newline at end of file
index e117525..cacfdae 100644 (file)
@@ -3,3 +3,7 @@ INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 lib_LTLIBRARIES = libnxddr_mysql.la
 libnxddr_mysql_la_SOURCES = mysql.cpp
 libnxddr_mysql_la_LDFLAGS = -version-info $(DBDRV_LIBRARY_VERSION)
+
+EXTRA_DIST = \
+       mysql.dsp mysql.dsw \
+       mysqldrv.h
index c622d3f..6326a20 100644 (file)
@@ -3,3 +3,5 @@ INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 lib_LTLIBRARIES = libnxddr_odbc.la
 libnxddr_odbc_la_SOURCES = odbc.cpp
 libnxddr_odbc_la_LDFLAGS = -version-info $(DBDRV_LIBRARY_VERSION)
+
+EXTRA_DIST = odbc.dsp odbc.dsw
index cd337bf..cf23578 100644 (file)
@@ -3,3 +3,7 @@ INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 lib_LTLIBRARIES = libnxddr_pgsql.la
 libnxddr_pgsql_la_SOURCES = pgsql.cpp
 libnxddr_pgsql_la_LDFLAGS = -version-info $(DBDRV_LIBRARY_VERSION)
+
+EXTRA_DIST = \
+       pgsql.dsp pgsql.dsw \
+       pgsqldrv.h
index 48f242c..881fd28 100644 (file)
@@ -3,3 +3,7 @@ INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 lib_LTLIBRARIES = libnxsrv.la
 libnxsrv_la_SOURCES = agent.cpp main.cpp rwlock.cpp
 libnxsrv_la_LDFLAGS = -version-info $(LIBNXSRV_LIBRARY_VERSION)
+
+EXTRA_DIST = \
+       libnxsrv.dsp libnxsrv.dsw \
+       libnxsrv.h
index 1f7fc4c..2519ccb 100644 (file)
@@ -8,4 +8,4 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-SUBDIRS = nxget nxaction
+SUBDIRS = nxget nxadm nxaction
index 1b83916..04146ca 100644 (file)
@@ -3,3 +3,6 @@ INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 bin_PROGRAMS = nxaction
 nxaction_SOURCES = nxaction.cpp
 nxaction_LDADD = @PTHREAD_LIBS@ ../../../libnetxms/libnetxms.la ../../../libnxcscp/libnxcscp.la ../../libnxsrv/libnxsrv.la
+
+EXTRA_DIST = \
+       nxaction.dsp nxaction.dsw
diff --git a/src/server/tools/nxadm/Makefile.am b/src/server/tools/nxadm/Makefile.am
new file mode 100644 (file)
index 0000000..6cca6d7
--- /dev/null
@@ -0,0 +1,9 @@
+INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
+
+bin_PROGRAMS = nxadm
+nxadm_SOURCES = comm.cpp nxadm.cpp
+nxadm_LDADD = @PTHREAD_LIBS@ ../../../libnetxms/libnetxms.la ../../../libnxcscp/libnxcscp.la ../../libnxsrv/libnxsrv.la
+
+EXTRA_DIST = \
+       nxadm.dsp nxadm.dsw \
+       nxadm.h
index 9835a04..2cd2079 100644 (file)
@@ -3,3 +3,6 @@ INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 bin_PROGRAMS = nxget
 nxget_SOURCES = nxget.cpp
 nxget_LDADD = @PTHREAD_LIBS@ ../../../libnetxms/libnetxms.la ../../../libnxcscp/libnxcscp.la ../../libnxsrv/libnxsrv.la
+
+EXTRA_DIST = \
+       nxget.dsp nxget.dsw