make sure that all header files are in the tarball (ported over from trunk)

Makefile.am

@@ -14,12 +14,20 @@ if LITE
 exclude=| egrep -v '(/sounds|/music)' 
 endif
 
+# List all datafiles, ignoring junk
 finddata=(cd $(top_srcdir) && find data fonts icons images sounds $(findfilterflags) -print ) $(exclude)
+# List all data subdirectories
 finddatadirs=(cd $(top_srcdir) && find data fonts icons images sounds -type d \! \( -name .svn -prune \) -print ) $(exclude)
+# List non-installable utility files
 findnoinst=(cd $(top_srcdir) && find utils $(findfilterflags) -print )
+# List all Header files
+findnoinst_headers=(cd $(top_srcdir) && find src -name "*.hpp" -print && find src -name "*.h" -print && find src -name "*.ii" -print && find src -name "*.i" -print )
 
+# Find files derived from the manual that should go in a distribution
 finddocdist=(cd $(top_srcdir) && find doc/manual -name "*.html" -o -name "*.css" -o -name "*.jpg" -o -name "*.txt")
+# Same list as previous, but with doc/ stripped off the front
 finddoc=($(finddocdist) | sed -e 's:doc/manual:manual:g' )
+# List all document directories
 finddocdirs=(cd $(top_srcdir)/doc && find manual -type d \! \( -name .svn -prune \) -print; )
 
 # This is a workaround to include manpage and manual translation files in the
@@ -145,7 +153,7 @@ endif
 
 dist-hook:
 	srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	( $(finddata); $(finddocdist); $(findnoinst); $(findextrapo) ) | (cd $(top_srcdir) && tar cf - -T -) | (cd $(distdir) && tar xf -)
+	( $(finddata); $(finddocdist); $(findnoinst); $(findnoinst_headers); $(findextrapo) ) | (cd $(top_srcdir) && tar cf - -T -) | (cd $(distdir) && tar xf -)
 
 dist_noinst_DATA = copyright changelog players_changelog wesnoth.dev editor.dev server.dev wesnoth.kdevelop campaign_server.dsp map_editor.dsp server.dsp wesnoth.dsp wesnoth.dsw
 

src/Makefile.am

@@ -227,149 +227,10 @@ test_DEPENDENCIES=libwesnoth-core.a libwesnoth.a
 #############################################################################
 
 noinst_HEADERS = \
-	tools/exploder_composer.hpp \
-	tools/exploder_utils.hpp \
-	tools/exploder_cutter.hpp \
-	serialization/tokenizer.hpp \
-	serialization/parser.hpp \
-	serialization/binary_or_text.hpp \
-	serialization/binary_wml.hpp \
-	serialization/preprocessor.hpp \
-	serialization/string_utils.hpp \
-	widgets/progressbar.hpp \
-	widgets/textbox.hpp \
-	widgets/combo.hpp \
-	widgets/file_menu.hpp \
-	widgets/scrollpane.hpp \
-	widgets/menu.hpp \
-	widgets/button.hpp \
-	widgets/label.hpp \
-	widgets/slider.hpp \
-	widgets/scrollbar.hpp \
-	widgets/widget.hpp \
-	widgets/scrollarea.hpp \
-	server/player.hpp \
-	server/game.hpp \
-	server/input_stream.hpp \
-	server/proxy.hpp \
-	server/metrics.hpp \
-	server/simple_wml.hpp \
-	editor/editor_undo.hpp \
-	editor/map_manip.hpp \
-	editor/editor_layout.hpp \
-	editor/editor.hpp \
-	editor/editor_palettes.hpp \
-	editor/editor_dialogs.hpp \
-	about.hpp \
-	actions.hpp \
-	ai.hpp \
-	ai2.hpp \
-	ai_dfool.hpp \
-	ai_interface.hpp \
-	ai_python.hpp \
-	animated.hpp \
 	animated.i \
-	array.hpp \
-	astarnode.hpp \
-	attack_prediction.hpp \
-	builder.hpp \
-	cavegen.hpp \
-	clipboard.hpp \
-	color_range.hpp \
-	config.hpp \
-	config_adapter.hpp \
-	construct_dialog.hpp \
-	cursor.hpp \
-	dialogs.hpp \
-	display.hpp \
-	events.hpp \
-	file_chooser.hpp \
-	filesystem.hpp \
-	floating_textbox.hpp \
-	font.hpp \
-	game_config.hpp \
-	game_display.hpp \
-	game_errors.hpp \
-	game_events.hpp \
-	game_preferences.hpp \
-	gamestatus.hpp \
-	generic_event.hpp \
-	gettext.hpp \
-	global.hpp \
-	halo.hpp \
-	help.hpp \
-	hotkeys.hpp \
-	image.hpp \
-	intro.hpp \
-	key.hpp \
-	language.hpp \
-	leader_list.hpp \
-	loadscreen.hpp \
-	log.hpp \
-	map.hpp \
-	map_create.hpp \
-	map_label.hpp \
-	mapgen.hpp \
-	mapgen_dialog.hpp \
-	marked-up_text.hpp \
-	menu_events.hpp \
-	minimap.hpp \
-	mouse_events.hpp \
-	multiplayer.hpp \
-	multiplayer_connect.hpp \
-	multiplayer_create.hpp \
-	multiplayer_lobby.hpp \
-	multiplayer_ui.hpp \
-	multiplayer_wait.hpp \
-	network.hpp \
-	network_worker.hpp \
-	pathfind.hpp \
-	pathutils.hpp \
-	play_controller.hpp \
-	playcampaign.hpp \
-	playmp_controller.hpp \
-	playsingle_controller.hpp \
-	playturn.hpp \
-	preferences.hpp \
-	preferences_display.hpp \
-	publish_campaign.hpp \
-	race.hpp \
-	random.hpp \
-	replay.hpp \
-	replay_controller.hpp \
-	reports.hpp \
-	scoped_resource.hpp \
-	sha1.hpp \
-	settings.hpp \
-	sdl_utils.hpp \
-	show_dialog.hpp \
-	sound.hpp \
-	soundsource.hpp \
-	statistics.hpp \
-	team.hpp \
-	terrain.hpp \
-	terrain_filter.hpp \
-	terrain_translation.hpp \
-	theme.hpp \
-	thread.hpp \
-	titlescreen.hpp \
-	tooltips.hpp \
-	tstring.hpp \
-	unit.hpp \
-	unit_abilities.hpp \
-	unit_animation.hpp \
-	unit_display.hpp \
-	unit_frame.hpp \
-	unit_map.hpp \
-	unit_types.hpp \
-	upload_log.hpp \
-	util.hpp \
-	variable.hpp \
-	video.hpp \
-	wml_separators.hpp \
-	sdl_ttf/SDL_ttf.h \
-	wesconfig.h \
-	wml_exception.hpp
+	filesystem_win32.ii \
+	language_win32.ii \
+	wesconfig.h
 
 #############################################################################
 #    Headers