From 3b0dbd29ca889b9efdcb0c35698ec53f7260653a Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Mon, 6 Dec 2010 21:24:49 +0900 Subject: [PATCH] make distcheck fixes --- Makefile.am | 2 +- config.d/ac_config_files.m4 | 3 +++ include/Makefile.am | 7 +++---- ruamoko/cl_menu/Makefile.am | 8 ++++---- vc2005/Makefile.am | 24 ++++++++++++++++++++++++ vc2008/Makefile.am | 24 ++++++++++++++++++++++++ 6 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 vc2005/Makefile.am create mode 100644 vc2008/Makefile.am diff --git a/Makefile.am b/Makefile.am index e5e2a1757..2d33b7d5d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS= foreign ACLOCAL_AMFLAGS = -I m4 SUBDIRS=RPM debian desktop doc include libs hw nq qtv qw tools ruamoko \ - pkg-config + pkg-config vc2005 vc2008 ## configure.ac needs to be listed here for older autoconfs EXTRA_DIST= ChangeLog configure.ac \ diff --git a/config.d/ac_config_files.m4 b/config.d/ac_config_files.m4 index 1b5ca4ac9..d1ee0395d 100644 --- a/config.d/ac_config_files.m4 +++ b/config.d/ac_config_files.m4 @@ -90,3 +90,6 @@ debian/Makefile desktop/Makefile + + vc2005/Makefile + vc2008/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index 026caa0db..11a240922 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -15,8 +15,7 @@ EXTRA_DIST = asm_i386.h alsa_funcs_list.h adivtab.h anorm_dots.h anorms.h \ \ qw/bothdefs.h qw/msg_backbuf.h qw/msg_ucmd.h qw/pmove.h qw/protocol.h \ \ - win32/fnmatch.h \ + win32/dirent.h win32/fnmatch.h win32/stdint.h \ \ - win32/resources/icon1.ico win32/resources/quakeforge.rc \ - win32/resources/resource.h - + win32/resources/icon1Vista.ico win32/resources/icon1XP.ico \ + win32/resources/quakeforge.rc win32/resources/resource.h diff --git a/ruamoko/cl_menu/Makefile.am b/ruamoko/cl_menu/Makefile.am index 0a4c60d95..439ca9322 100644 --- a/ruamoko/cl_menu/Makefile.am +++ b/ruamoko/cl_menu/Makefile.am @@ -47,9 +47,9 @@ menu.dat$(GZ): $(menu_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a ../gui/lib $(GZIP) EXTRA_DIST= $(menu_src) \ - Frame.h HUD.h \ - client_menu.h controls_o.h \ - menu.h options.h \ - options_util.h servlist.h \ + CrosshairCvar.h CrosshairView.h CvarColor.h CvarColorView.h CvarObject.h \ + CvarRange.h CvarRangeView.h CvarToggle.h CvarToggleView.h Frame.h HUD.h \ + MenuGroup.h MouseToggle.h ProxyView.h RunToggle.h client_menu.h \ + controls_o.h menu.h options.h options_util.h plistmenu.h servlist.h \ menu.plist CLEANFILES= *.dat *.sym *.gz *.qfo diff --git a/vc2005/Makefile.am b/vc2005/Makefile.am new file mode 100644 index 000000000..d130f0cb3 --- /dev/null +++ b/vc2005/Makefile.am @@ -0,0 +1,24 @@ +## Process this file with automake to produce Makefile.in +AUTOMAKE_OPTIONS= foreign +EXTRA_DIST = + Makefile.am QuakeForge-VS8-Express.sln QuakeForge-VS8.sln \ + bsp2img/bsp2img.vcproj builtins/builtins.vcproj clean.ps1 \ + common/common.vcproj console/console.vcproj \ + console_client/console_client.vcproj console_server/console_server.vcproj \ + engine/engine.vcproj gib/gib.vcproj hw-master/hw-master.vcproj \ + image/image.vcproj include/config.h models-sw/models-sw.vcproj \ + models/models.vcproj modelsgl/modelsgl.vcproj net-main/net-main.vcproj \ + net/net.vcproj nq-common/nq-common.vcproj nq-sdl/nq-sdl.vcproj \ + nq-sdl32/nq-sdl32.vcproj nq-server/nq-server.vcproj nq-sgl/nq-sgl.vcproj \ + nq-wgl/nq-wgl.vcproj nq/nq.vcproj pak/pak.vcproj qfbsp/qfbsp.vcproj \ + qfcc/FlexBison.rules qfcc/qfcc.vcproj qfclient/qfclient.vcproj \ + qflight/qflight.vcproj qfmodelgen/qfmodelgen.vcproj \ + qfprogs/qfprogs.vcproj qfserver/qfserver.vcproj qfvis/qfvis.vcproj \ + qfwavinfo/qfwavinfo.vcproj qtv/qtv.vcproj \ + qw-client-sdl/qw-client-sdl.vcproj qw-client-sdl32/qw-client-sdl32.vcproj \ + qw-client-sgl/qw-client-sgl.vcproj qw-client-wgl/qw-client-wgl.vcproj \ + qw-master/qw-master.vcproj qw/qw.vcproj readme.txt ruamoko/ruamoko.vcproj \ + sound/sound.vcproj util/util.vcproj video-sdl/video-sdl.vcproj \ + video-sgl/video-sgl.vcproj video-sw/video-sw.vcproj \ + video-sw32/video-sw32.vcproj video-wgl/video-wgl.vcproj \ + video/video.vcproj videogl/videogl.vcproj wad/wad.vcproj diff --git a/vc2008/Makefile.am b/vc2008/Makefile.am new file mode 100644 index 000000000..0101f105a --- /dev/null +++ b/vc2008/Makefile.am @@ -0,0 +1,24 @@ +## Process this file with automake to produce Makefile.in +AUTOMAKE_OPTIONS= foreign +EXTRA_DIST = + Makefile.am QuakeForge.sln bsp2img/bsp2img.vcproj \ + builtins/builtins.vcproj clean.ps1 common/common.vcproj \ + console/console.vcproj console_client/console_client.vcproj \ + console_server/console_server.vcproj engine/engine.vcproj gib/gib.vcproj \ + hw-master/hw-master.vcproj image/image.vcproj include/config.h \ + models-sw/models-sw.vcproj models/models.vcproj modelsgl/modelsgl.vcproj \ + net-main/net-main.vcproj net/net.vcproj nq-common/nq-common.vcproj \ + nq-sdl/nq-sdl.vcproj nq-sdl32/nq-sdl32.vcproj nq-server/nq-server.vcproj \ + nq-sgl/nq-sgl.vcproj nq-wgl/nq-wgl.vcproj nq/nq.vcproj pak/pak.vcproj \ + qfbsp/qfbsp.vcproj qfcc/FlexBison.rules qfcc/qfcc.vcproj \ + qfclient/qfclient.vcproj qflight/qflight.vcproj \ + qfmodelgen/qfmodelgen.vcproj qfprogs/qfprogs.vcproj \ + qfserver/qfserver.vcproj qfvis/qfvis.vcproj qfwavinfo/qfwavinfo.vcproj \ + qtv/qtv.vcproj qw-client-sdl/qw-client-sdl.vcproj \ + qw-client-sdl32/qw-client-sdl32.vcproj qw-client-sgl/qw-client-sgl.vcproj \ + qw-client-wgl/qw-client-wgl.vcproj qw-master/qw-master.vcproj \ + qw/qw.vcproj readme.txt ruamoko/ruamoko.vcproj sound/sound.vcproj \ + util/util.vcproj video-sdl/video-sdl.vcproj video-sgl/video-sgl.vcproj \ + video-sw/video-sw.vcproj video-sw32/video-sw32.vcproj \ + video-wgl/video-wgl.vcproj video/video.vcproj videogl/videogl.vcproj \ + wad/wad.vcproj