-@INCLUDED_GETOPT_LONG_TRUE@EXTRA_DIRS = getopt
-@INCLUDED_GETOPT_LONG_FALSE@EXTRA_DIRS =
-
-SUBDIRS = $(EXTRA_DIRS) libcio libk libkmath libgraph libezplot libir src man html cgi-bin include
+wxcflags = @wxcflags@
+wxconfig = @wxconfig@
+wxlibs = @wxlibs@
+@INCLUDED_GETOPT_LONG_TRUE@EXTRA_DIRS1 = getopt
+@INCLUDED_GETOPT_LONG_FALSE@EXTRA_DIRS1 =
+@HAVE_SGP_TRUE@EXTRA_DIRS2 = libctgraphics
+@HAVE_SGP_FALSE@EXTRA_DIRS2 =
+@HAVE_WXWINDOWS_TRUE@EXTRA_DIRS3 = src
+@HAVE_WXWINDOWS_FALSE@EXTRA_DIRS3 =
+
+SUBDIRS = $(EXTRA_DIRS1) $(EXTRA_DIRS2) libctsupport libctsim man doc html cgi-bin include tools $(EXTRA_DIRS3)
+
+EXTRA_DIST = acsite.m4 make.bat msvc/ctsim.dsw msvc/ctsimtext/ctsimtext.dsp msvc/libctsim/libctsim.dsp msvc/ctsim/ctsim.dsp