Skip to content

W
wine-winehq
Commit 9463687f authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

makefiles: Build the programs directly from the top-level makefile.

parent 5acb4315
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 64 deletions
Makefile.in
View file @ 9463687f
...@@ -28,6 +28,8 @@ LIBEXT = @LIBEXT@ ...@@ -28,6 +28,8 @@ LIBEXT = @LIBEXT@
MODULE = none MODULE = none
ALL_DLL_DIRS = @ALL_DLL_DIRS@ ALL_DLL_DIRS = @ALL_DLL_DIRS@
ALL_INSTALL_DIRS = @ALL_INSTALL_DIRS@
ALL_PROGRAM_DIRS = @ALL_PROGRAM_DIRS@
ALL_STATICLIB_DIRS = @ALL_STATICLIB_DIRS@ ALL_STATICLIB_DIRS = @ALL_STATICLIB_DIRS@
ALL_TEST_DIRS = @ALL_TEST_DIRS@ ALL_TEST_DIRS = @ALL_TEST_DIRS@
ALL_TOOL_DIRS = @ALL_TOOL_DIRS@ ALL_TOOL_DIRS = @ALL_TOOL_DIRS@
...@@ -47,6 +49,7 @@ SUBDIRS = \ ...@@ -47,6 +49,7 @@ SUBDIRS = \
$(ALL_TOOL_DIRS) \ $(ALL_TOOL_DIRS) \
$(ALL_STATICLIB_DIRS) \ $(ALL_STATICLIB_DIRS) \
$(ALL_DLL_DIRS) \ $(ALL_DLL_DIRS) \
$(ALL_PROGRAM_DIRS) \
$(ALL_TEST_DIRS) $(ALL_TEST_DIRS)
# Sub-directories to run make all into # Sub-directories to run make all into
...@@ -56,6 +59,7 @@ BUILDSUBDIRS = \ ...@@ -56,6 +59,7 @@ BUILDSUBDIRS = \
$(ALL_TOP_DIRS) \ $(ALL_TOP_DIRS) \
$(ALL_STATICLIB_DIRS) \ $(ALL_STATICLIB_DIRS) \
$(ALL_DLL_DIRS) \ $(ALL_DLL_DIRS) \
$(ALL_PROGRAM_DIRS) \
$(ALL_TEST_DIRS) $(ALL_TEST_DIRS)
# Sub-directories to run make install/uninstall into # Sub-directories to run make install/uninstall into
...@@ -64,7 +68,8 @@ INSTALLSUBDIRS = \ ...@@ -64,7 +68,8 @@ INSTALLSUBDIRS = \
$(ALL_TOOL_DIRS) \ $(ALL_TOOL_DIRS) \
$(ALL_TOP_DIRS) \ $(ALL_TOP_DIRS) \
$(ALL_STATICLIB_DIRS) \ $(ALL_STATICLIB_DIRS) \
$(ALL_DLL_DIRS) $(ALL_DLL_DIRS) \
$(ALL_INSTALL_DIRS)
# Sub-directories to run make test into # Sub-directories to run make test into
TESTSUBDIRS = $(ALL_TEST_DIRS) TESTSUBDIRS = $(ALL_TEST_DIRS)
...@@ -119,17 +124,15 @@ __builddeps__: libs/port libs/wine libs/wpp $(ALL_TOOL_DIRS) include $(ALL_STATI ...@@ -119,17 +124,15 @@ __builddeps__: libs/port libs/wine libs/wpp $(ALL_TOOL_DIRS) include $(ALL_STATI
__buildcrossdeps__: libs/port libs/wine $(ALL_TOOL_DIRS) include $(STATIC_LIBS:.a=.cross.a) $(IMPORT_LIBS:.def=.cross.a) __buildcrossdeps__: libs/port libs/wine $(ALL_TOOL_DIRS) include $(STATIC_LIBS:.a=.cross.a) $(IMPORT_LIBS:.def=.cross.a)
.PHONY: __builddeps__ __buildcrossdeps__ .PHONY: __builddeps__ __buildcrossdeps__
programs: __builddeps__
loader server: libs/port libs/wine tools loader server: libs/port libs/wine tools
fonts: tools fonts: tools
include: tools/widl include: tools/widl
programs: $(ALL_TEST_DIRS) programs/winetest: $(ALL_TEST_DIRS)
libs/wine $(ALL_TOOL_DIRS): libs/port libs/wine $(ALL_TOOL_DIRS): libs/port
tools/wmc tools/wrc: tools tools/wmc tools/wrc: tools
tools tools/wmc tools/wrc: libs/wine tools tools/wmc tools/wrc: libs/wine
tools/widl tools/wmc tools/wrc: libs/wpp tools/widl tools/wmc tools/wrc: libs/wpp
programs/__install__ programs/__install-lib__: __builddeps__
fonts/__install__ fonts/__install-lib__: tools fonts/__install__ fonts/__install-lib__: tools
include/__install__ include/__install-dev__: include include/__install__ include/__install-dev__: include
libs/wine/__install__ libs/wine/__install-lib__ libs/wine/__install-dev__: libs/wine libs/wine/__install__ libs/wine/__install-lib__ libs/wine/__install-dev__: libs/wine
...@@ -152,7 +155,6 @@ RECURSE_TARGETS = \ ...@@ -152,7 +155,6 @@ RECURSE_TARGETS = \
__uninstall__ \ __uninstall__ \
__crosstest__ __crosstest__
programs $(RECURSE_TARGETS:%=programs/%): $(MAKEDEP)
depend: $(MAKEDEP) depend: $(MAKEDEP)
$(MAKEDEP): include/config.h tools/Makefile $(MAKEDEP): include/config.h tools/Makefile
...@@ -188,8 +190,6 @@ $(ALL_CONFIGS): ...@@ -188,8 +190,6 @@ $(ALL_CONFIGS):
.BEGIN: Makefile .BEGIN: Makefile
.MAKEFILEDEPS: .MAKEFILEDEPS:
programs $(RECURSE_TARGETS:%=programs/%): $(ALL_MAKEFILES)
distclean:: distclean::
$(RM) $(ALL_CONFIGS) $(RM) $(ALL_CONFIGS)
......
aclocal.m4
View file @ 9463687f
...@@ -216,7 +216,9 @@ dnl ...@@ -216,7 +216,9 @@ dnl
dnl Usage: WINE_CONFIG_PROGRAM(name,var,enable) dnl Usage: WINE_CONFIG_PROGRAM(name,var,enable)
dnl dnl
AC_DEFUN([WINE_CONFIG_PROGRAM], AC_DEFUN([WINE_CONFIG_PROGRAM],
[WINE_CONFIG_MAKEFILE([programs/$1/Makefile],[programs/Makeprog.rules],[programs],[$2],[$3])]) [ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
programs/$1 programs/$1/__install__ programs/$1/__install-lib__: __builddeps__"
WINE_CONFIG_MAKEFILE([programs/$1/Makefile],[programs/Makeprog.rules],[],[$2],m4_default([$3],[enable_$1]))])
dnl **** Create a test makefile from config.status **** dnl **** Create a test makefile from config.status ****
dnl dnl
......
configure.ac
View file @ 9463687f
...@@ -2109,10 +2109,10 @@ AC_SUBST(ALL_TOOL_DIRS,"") ...@@ -2109,10 +2109,10 @@ AC_SUBST(ALL_TOOL_DIRS,"")
AC_SUBST(ALL_STATICLIB_DIRS,"") AC_SUBST(ALL_STATICLIB_DIRS,"")
AC_SUBST(ALL_STATIC_LIBS,"") AC_SUBST(ALL_STATIC_LIBS,"")
AC_SUBST(ALL_IMPORT_LIBS,"") AC_SUBST(ALL_IMPORT_LIBS,"")
AC_SUBST(ALL_INSTALL_DIRS,"")
AC_SUBST(ALL_TEST_DIRS,"") AC_SUBST(ALL_TEST_DIRS,"")
AC_SUBST(ALL_TEST_BINARIES,"") AC_SUBST(ALL_TEST_BINARIES,"")
AC_SUBST(ALL_PROGRAM_DIRS,"") AC_SUBST(ALL_PROGRAM_DIRS,"")
AC_SUBST(ALL_PROGRAM_INSTALL_DIRS,"")
AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"")
AH_TOP([#define __WINE_CONFIG_H]) AH_TOP([#define __WINE_CONFIG_H])
...@@ -2615,61 +2615,61 @@ WINE_CONFIG_MAKEFILE([libs/wine/Makefile],[Make.rules]) ...@@ -2615,61 +2615,61 @@ WINE_CONFIG_MAKEFILE([libs/wine/Makefile],[Make.rules])
WINE_CONFIG_MAKEFILE([libs/wpp/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([libs/wpp/Makefile],[Make.rules])
WINE_CONFIG_MAKEFILE([loader/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([loader/Makefile],[Make.rules],[],[ALL_TOP_DIRS])
WINE_CONFIG_MAKEFILE([programs/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([programs/Makefile],[Make.rules],[],[ALL_TOP_DIRS])
WINE_CONFIG_PROGRAM(cacls,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(cacls,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(clock,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(clock,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(cmd,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(cmd,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_TEST(programs/cmd/tests) WINE_CONFIG_TEST(programs/cmd/tests)
WINE_CONFIG_PROGRAM(cmdlgtst,[ALL_PROGRAM_DIRS]) WINE_CONFIG_PROGRAM(cmdlgtst,[ALL_PROGRAM_DIRS])
WINE_CONFIG_PROGRAM(control,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(control,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(dxdiag,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(dxdiag,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(eject,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(eject,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(expand,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(expand,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(explorer,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(explorer,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(extrac32,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(extrac32,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(hh,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(hh,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(icinfo,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(icinfo,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(iexplore,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(iexplore,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(lodctr,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(lodctr,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(mshta,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(mshta,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(msiexec,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(msiexec,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(net,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(net,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(notepad,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(notepad,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(oleview,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(oleview,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(progman,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(progman,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(reg,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(reg,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(regedit,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(regedit,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(regsvr32,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(regsvr32,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(rpcss,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(rpcss,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(rundll32,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(rundll32,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(secedit,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(secedit,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(services,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(services,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(spoolsv,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(spoolsv,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(start,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(start,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(svchost,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(svchost,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(taskmgr,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(taskmgr,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(termsv,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(termsv,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(uninstaller,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(uninstaller,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(unlodctr,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(unlodctr,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(view,[ALL_PROGRAM_DIRS]) WINE_CONFIG_PROGRAM(view,[ALL_PROGRAM_DIRS])
WINE_CONFIG_PROGRAM(wineboot,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(wineboot,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(winebrowser,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(winebrowser,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(winecfg,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(winecfg,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(wineconsole,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(wineconsole,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(winedbg,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(winedbg,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(winedevice,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(winedevice,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(winefile,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(winefile,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(winemenubuilder,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(winemenubuilder,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(winemine,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(winemine,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(winepath,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(winepath,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(winetest,[ALL_PROGRAM_DIRS]) WINE_CONFIG_PROGRAM(winetest,[ALL_PROGRAM_DIRS])
WINE_CONFIG_PROGRAM(winevdm,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS],enable_win16) WINE_CONFIG_PROGRAM(winevdm,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS],enable_win16)
WINE_CONFIG_PROGRAM(winhelp.exe16,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS],enable_win16) WINE_CONFIG_PROGRAM(winhelp.exe16,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS],enable_win16)
WINE_CONFIG_PROGRAM(winhlp32,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(winhlp32,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(winoldap.mod16,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS],enable_win16) WINE_CONFIG_PROGRAM(winoldap.mod16,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS],enable_win16)
WINE_CONFIG_PROGRAM(winver,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(winver,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(wordpad,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(wordpad,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(write,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(write,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_PROGRAM(xcopy,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(xcopy,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
WINE_CONFIG_MAKEFILE([server/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([server/Makefile],[Make.rules],[],[ALL_TOP_DIRS])
WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools])
WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools])
......
programs/Makefile.in
View file @ 9463687f
...@@ -3,8 +3,6 @@ TOPOBJDIR = .. ...@@ -3,8 +3,6 @@ TOPOBJDIR = ..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
SUBDIRS = @ALL_PROGRAM_DIRS@
INSTALLSUBDIRS = @ALL_PROGRAM_INSTALL_DIRS@
INSTALLPROGS = @ALL_PROGRAM_BIN_INSTALL_DIRS@ INSTALLPROGS = @ALL_PROGRAM_BIN_INSTALL_DIRS@
INSTALLDIRS = $(DESTDIR)$(bindir) INSTALLDIRS = $(DESTDIR)$(bindir)
...@@ -13,7 +11,7 @@ PROGRAMS = wineapploader ...@@ -13,7 +11,7 @@ PROGRAMS = wineapploader
@MAKE_RULES@ @MAKE_RULES@
all: $(PROGRAMS) $(SUBDIRS) all: $(PROGRAMS)
wineapploader: wineapploader.in wineapploader: wineapploader.in
sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false)
......
tools/make_makefiles
View file @ 9463687f
...@@ -373,7 +373,7 @@ sub update_makefiles(@) ...@@ -373,7 +373,7 @@ sub update_makefiles(@)
{ {
(my $name = $file) =~ s/^programs\/(.*)\/Makefile/$1/; (my $name = $file) =~ s/^programs\/(.*)\/Makefile/$1/;
$args = ",[ALL_PROGRAM_DIRS"; $args = ",[ALL_PROGRAM_DIRS";
$args .= ",ALL_PROGRAM_INSTALL_DIRS" unless $dont_install{$name}; $args .= ",ALL_INSTALL_DIRS" unless $dont_install{$name};
$args .= ",ALL_PROGRAM_BIN_INSTALL_DIRS" if $bin_install{$name}; $args .= ",ALL_PROGRAM_BIN_INSTALL_DIRS" if $bin_install{$name};
$args .= "]"; $args .= "]";
$args .= ",enable_win16" if $is_win16; $args .= ",enable_win16" if $is_win16;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment