Fix dist building

diff --git a/Doxyfile.in b/Doxyfile.in
index 2a71dd3675770198e5e91bbc5a5ade8e784e1ea3..1373b53671729825c579db78eb4299bb732e3f77 100644 (file)
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -268,7 +268,7 @@ AUTOLINK_SUPPORT       = YES
 # func(std::string) {}). This also makes the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
 
-BUILTIN_STL_SUPPORT    = NO
+BUILTIN_STL_SUPPORT    = YES
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.

diff --git a/Makefile.am b/Makefile.am
index d19edf84c2ce6bc62e5fcae159946b10bc64cfc2..25ac710df92557acd7245b9212042199b038a12e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,13 +37,18 @@ BUILT_SOURCES = \
   src/kernel/kernel.moc.cpp \
   src/edit/editor.moc.cpp \
   src/lgconfig/lgconfig.moc.cpp \
-  src/preproc/prep.moc.cpp \
-  src/help/help.moc
-
-bin_loggraph_SOURCES = src/graph/loggraph.cpp src/graph/loggraph.moc.cpp
+  src/preproc/prep.moc.cpp
+#  \
+#  src/help/help.moc
+
+bin_loggraph_SOURCES = \
+       $(bin_loggraph_HEADERS) \
+       src/graph/loggraph.cpp \
+       src/graph/loggraph.moc.cpp
 bin_loggraph_CPPFLAGS = $(bin_loggraph_CFLAGS)
 bin_loggraph_LDADD = $(bin_loggraph_LIBS)
-bin_lognet_HEADERS = \
+bin_loggraphdir = src/graph
+bin_loggraph_HEADERS = \
        src/graph/loggraph.h
 src/graph/loggraph.moc.cpp:
        $(MOC) src/graph/loggraph.h -o src/graph/loggraph.moc.cpp
@@ -53,7 +58,10 @@ clean-loggraph-extra:
        rm -f bin/modules/loggraph
        rm -f bin/loggraph
 
-bin_lognet_SOURCES = src/net/lognet.cpp src/net/lognet.moc.cpp
+bin_lognet_SOURCES = \
+       $(bin_lognet_HEADERS) \
+       src/net/lognet.cpp \
+       src/net/lognet.moc.cpp
 bin_lognet_CPPFLAGS = $(bin_lognet_CFLAGS)
 bin_lognet_LDADD = $(bin_lognet_LIBS) -lconfig++
 bin_lognetdir = src/net
@@ -68,6 +76,7 @@ clean-lognet-extra:
        rm -f bin/lognet
        
 bin_logker_SOURCES = \
+       $(bin_logker_HEADERS) \
        src/kernel/kernel.cpp \
        src/kernel/kernel.moc.cpp \
        src/kernel/ConnectDialog.cpp \
@@ -133,6 +142,7 @@ clean-logker-extra:
        rm -f bin/logker
        
 bin_logint_SOURCES = \
+  $(bin_logint_HEADERS) \
   src/int/cint.c \
   src/int/compact.c \
   src/int/control.c \
@@ -175,6 +185,7 @@ clean-logint-extra:
        rm -f bin/logint
 
 bin_logedit_SOURCES = \
+       $(bin_logedit_HEADERS) \
        src/edit/editor.cpp \
        src/edit/editor.moc.cpp \
        src/edit/ProgramStructureDialog.cpp \
@@ -184,7 +195,7 @@ bin_logedit_SOURCES = \
 bin_logedit_CPPFLAGS = $(bin_logedit_CFLAGS)
 bin_logedit_LDADD = $(bin_logedit_LIBS)
 bin_logeditdir = src/edit
-bin_logedit_HEADERS =\
+bin_logedit_HEADERS = \
        src/edit/editor.h \
        src/edit/ui/editor.h \
        src/edit/ProgramStructureDialog.h \
@@ -229,6 +240,7 @@ clean-logedit-extra:
        rm -f bin/logedit
 
 bin_lgconfig_SOURCES = \
+       $(bin_lgconfig_HEADERS) \
        src/lgconfig/lgconfig.cpp \
        src/lgconfig/lgconfig.moc.cpp \
        src/lgconfig/AddNodeDialog.cpp \
@@ -238,8 +250,11 @@ bin_lgconfig_SOURCES = \
        src/global/vlp/config.cpp
 bin_lgconfig_CPPFLAGS = $(bin_lgconfig_CFLAGS)
 bin_lgconfig_LDADD = $(bin_lgconfig_LIBS) -lconfig++
-bin_logedit_HEADERS = \
+bin_lgconfigdir = src/lgconfig
+bin_lgconfig_HEADERS = \
        src/lgconfig/lgconfig.h \
+       src/lgconfig/NodeListDialog.h \
+       src/lgconfig/AddNodeDialog.h \
        src/lgconfig/ui/VLPConfigWindow.h \
        src/lgconfig/ui/dialogs/AddNodeDialog.h \
        src/lgconfig/ui/dialogs/NodeListDialog.h \
@@ -274,9 +289,12 @@ clean-lgconfig-extra:
        rm -f src/lgconfig/ui/dialogs/*.h
        rm -f bin/lgconfig
 
-bin_logcomp_SOURCES = src/preproc/prep.cpp src/preproc/prep.moc.cpp
+bin_logcomp_SOURCES = \
+       src/preproc/prep.cpp \
+       src/preproc/prep.moc.cpp
 bin_logcomp_CPPFLAGS = $(bin_logcomp_CFLAGS)
 bin_logcomp_LDADD = $(bin_logcomp_LIBS)
+
 src/preproc/prep.moc.cpp: src/preproc/prep.cpp 
        $(MOC) src/preproc/prep.cpp -o src/preproc/prep.moc.cpp
 
@@ -284,9 +302,12 @@ clean-logcomp-extra:
        rm -f src/preproc/*.moc
        rm -f bin/logcomp
 
-bin_loghelp_SOURCES = src/help/help.cpp src/help/help.moc
+bin_loghelp_SOURCES = \
+       src/help/help.cpp \
+       src/help/help.moc
 bin_loghelp_CPPFLAGS = $(bin_loghelp_CFLAGS)
 bin_loghelp_LDADD = $(bin_loghelp_LIBS)
+
 src/help/help.moc:
        $(MOC) -i src/help/help.cpp -o src/help/help.moc