install wxUniv headers in make install and include wxUniv sources in make dist

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

Makefile.in

@@ -139,8 +139,8 @@ WX_LINGUAS = `cd $(top_srcdir)/locale && ls *.mo 2> /dev/null | sed -n 's/\.mo//
 # .d and .h/.inl files for the current toolkit
 include @PORT_FILES@
 
-SOURCES = $(ALL_SOURCES)
+SOURCES = @ALL_SOURCES@
-HEADERS = $(ALL_HEADERS)
+HEADERS = @ALL_HEADERS@
 
 # for the objects and depfiles, we might be bulding only part of them
 # depending on configure arguments, so select a subset of ALL

configure.in

@@ -2030,12 +2030,21 @@ equivalent variable and GTK+ is version 1.2.3 or above.
 
     if test "$wxUSE_UNIVERSAL" = "yes"; then
         ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}"
+
+        dnl ALL_SOURCES and ALL_HEADERS shouldn't include really all sources
+        dnl and headers as some/most are not needed for wxUniv but I don't
+        dnl have time to add GUI_LOWLEVEL_SOURCES/HEADERS stuff now (TODO!)
+        ALL_SOURCES="\$(ALL_SOURCES) \${UNIV_SOURCES}"
+        ALL_HEADERS="\$(ALL_HEADERS) \${UNIV_HEADERS}"
+
         PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
         TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}"
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
         WIDGET_SET=univ
     else
         ALL_OBJECTS="\$(GUIOBJS)"
+        ALL_SOURCES="\$(ALL_SOURCES)"
+        ALL_HEADERS="\$(ALL_HEADERS)"
     fi
 
     ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)"
@@ -4675,8 +4684,10 @@ AC_SUBST(WXCONFIG_LIBS_STATIC)
 AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
 AC_SUBST(WXCONFIG_INCLUDE)
 
-dnl what to compile
+dnl the list of files to compile/install
 AC_SUBST(ALL_OBJECTS)
+AC_SUBST(ALL_HEADERS)
+AC_SUBST(ALL_SOURCES)
 
 dnl distribution vars
 AC_SUBST(GUIDIST)

distrib/msw/tmake/univ.t

@@ -16,13 +16,27 @@
     foreach $file (sort keys %wxUNIV) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
+        if ( $wxUNIV{$file} =~ /Theme/ ) {
+            $file = "themes/" . $file
+        }
+
         $project{"UNIV_SOURCES"} .= "univ/" . $file . " ";
         $project{"UNIVOBJS"} .= $fileobj . " ";
     }
 
+    #! and headers
+    foreach $hdr (sort keys %wxUNIVINCLUDE) {
+        $project{"UNIV_HEADERS"} .= "univ/" . $hdr . " ";
+    }
 #$}
 # This file was automatically generated by tmake at #$ Now()
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNIV.T!
+UNIV_SOURCES = \
+		#$ ExpandList("UNIV_SOURCES");
+
+UNIV_HEADERS = \
+		#$ ExpandList("UNIV_HEADERS");
+
 UNIVOBJS = \
 		#$ ExpandList("UNIVOBJS");
 

src/univ/files.lst

@@ -1,5 +1,80 @@
-# This file was automatically generated by tmake at 11:30, 2002/01/23
+# This file was automatically generated by tmake at 16:09, 2002/01/25
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNIV.T!
+UNIV_SOURCES = \
+		univ/bmpbuttn.cpp \
+		univ/button.cpp \
+		univ/checkbox.cpp \
+		univ/checklst.cpp \
+		univ/choice.cpp \
+		univ/colschem.cpp \
+		univ/combobox.cpp \
+		univ/control.cpp \
+		univ/dialog.cpp \
+		univ/framuniv.cpp \
+		univ/gauge.cpp \
+		univ/themes/gtk.cpp \
+		univ/inpcons.cpp \
+		univ/inphand.cpp \
+		univ/listbox.cpp \
+		univ/menu.cpp \
+		univ/notebook.cpp \
+		univ/radiobox.cpp \
+		univ/radiobut.cpp \
+		univ/renderer.cpp \
+		univ/scrarrow.cpp \
+		univ/scrolbar.cpp \
+		univ/scrthumb.cpp \
+		univ/slider.cpp \
+		univ/spinbutt.cpp \
+		univ/statbmp.cpp \
+		univ/statbox.cpp \
+		univ/statline.cpp \
+		univ/stattext.cpp \
+		univ/statusbr.cpp \
+		univ/textctrl.cpp \
+		univ/theme.cpp \
+		univ/topluniv.cpp \
+		univ/themes/win32.cpp \
+		univ/winuniv.cpp
+
+UNIV_HEADERS = \
+		univ/app.h \
+		univ/bmpbuttn.h \
+		univ/button.h \
+		univ/checkbox.h \
+		univ/checklst.h \
+		univ/choice.h \
+		univ/colschem.h \
+		univ/combobox.h \
+		univ/control.h \
+		univ/frame.h \
+		univ/gauge.h \
+		univ/inpcons.h \
+		univ/inphand.h \
+		univ/listbox.h \
+		univ/menu.h \
+		univ/menuitem.h \
+		univ/notebook.h \
+		univ/radiobox.h \
+		univ/radiobut.h \
+		univ/renderer.h \
+		univ/scrarrow.h \
+		univ/scrolbar.h \
+		univ/scrthumb.h \
+		univ/scrtimer.h \
+		univ/setup.h \
+		univ/slider.h \
+		univ/spinbutt.h \
+		univ/statbmp.h \
+		univ/statbox.h \
+		univ/statline.h \
+		univ/stattext.h \
+		univ/statusbr.h \
+		univ/textctrl.h \
+		univ/theme.h \
+		univ/toplevel.h \
+		univ/window.h
+
 UNIVOBJS = \
 		bmpbuttn.o \
 		button.o \