Building wxMSW with configure now also properly installs the msw headers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index d2650c0f1d154d05cf673617da8fe77019fa35a0..9955d039e79f13321099e2e97869e1f209e66377 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -982,7 +982,7 @@ WXWINE=
 if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
   AC_MSG_CHECKING(for Windows headers)
   WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
-
+  INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
   if test "$ac_find_includes" != "" ; then
     AC_MSG_RESULT(found $ac_find_includes)
     TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
@@ -2172,6 +2172,8 @@ dnl             samples/Makefile samples/minimal/Makefile
             include/wx/gtk/Makefile
             include/wx/motif/Makefile
             include/wx/msw/Makefile
+            include/wx/msw/gnuwin32/Makefile
+            include/wx/msw/ctl3d/Makefile
             include/wx/protocol/Makefile
             include/wx/unix/Makefile
             include/wx/html/Makefile

diff --git a/include/wx/msw/Makefile.am b/include/wx/msw/Makefile.am
index 851d48cae28ef3ec0bb5c2b9856274e437f5171c..15c17a5e5a2d622226a0f8c5be9b5ea8771f79eb 100644 (file)
--- a/include/wx/msw/Makefile.am
+++ b/include/wx/msw/Makefile.am
@@ -4,7 +4,97 @@
 ##
 ## Process this file with automake to produce Makefile.in
 
-# TODO
+# HH: We only go into gnuwin32 and ctl3d now, since ole doesn't work anyway.
+SUBDIRS = gnuwin32 ctl3d
 
-# include_HEADERS = 
+wx_msw_includedir = ${includedir}/wx/msw
 
+wx_msw_include_HEADERS = \
+accel.h \
+app.h \
+bitmap.h \
+bmpbuttn.h \
+brush.h \
+button.h \
+caret.h \
+checkbox.h \
+checklst.h \
+choice.h \
+clipbrd.h \
+colordlg.h \
+colour.h \
+combobox.h \
+control.h \
+curico.h \
+curicop.h \
+cursor.h \
+dc.h \
+dcclient.h \
+dcmemory.h \
+dcprint.h \
+dcscreen.h \
+dde.h \
+dialog.h \
+dib.h \
+dibutils.h \
+dirdlg.h \
+dragimag.h \
+filedlg.h \
+font.h \
+fontdlg.h \
+frame.h \
+gauge.h \
+gauge95.h \
+gaugemsw.h \
+gdiobj.h \
+helpwin.h \
+icon.h \
+imaglist.h \
+iniconf.h \
+joystick.h \
+listbox.h \
+listctrl.h \
+mdi.h \
+menu.h \
+menuitem.h \
+metafile.h \
+minifram.h \
+msgdlg.h \
+msvcrt.h \
+notebook.h \
+palette.h \
+pen.h \
+pnghand.h \
+pngread.h \
+printdlg.h \
+printwin.h \
+private.h \
+radiobox.h \
+radiobut.h \
+regconf.h \
+region.h \
+registry.h \
+scrolbar.h \
+settings.h \
+setup0.h \
+slider.h \
+slider95.h \
+slidrmsw.h \
+spinbutt.h \
+statbmp.h \
+statbox.h \
+statbr95.h \
+statline.h \
+stattext.h \
+tabctrl.h \
+taskbar.h \
+tbar95.h \
+tbarmsw.h \
+textctrl.h \
+timer.h \
+tooltip.h \
+treectrl.h \
+wave.h \
+window.h \
+winundef.h \
+xpmhand.h 

diff --git a/include/wx/msw/ctl3d/Makefile.am b/include/wx/msw/ctl3d/Makefile.am
new file mode 100644 (file)
index 0000000..1ff87e2
--- /dev/null
+++ b/include/wx/msw/ctl3d/Makefile.am
@@ -0,0 +1,7 @@
+## Purpose: The automake makefile for wxWindows (include/wx/msw/ctl3d.h subdir)
+##
+## Process this file with automake to produce Makefile.in
+
+wx_msw_ctl3d_includedir = ${includedir}/wx/msw/ctl3d
+
+wx_msw_ctl3d_include_HEADERS = ctl3d.h