Skip to content

W
wine-winehq
Commit 318f4cef authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Build most dlls as separate shared libraries.

parent 7357337f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 772 additions and 380 deletions
Make.rules.in
View file @ 318f4cef
......@@ -25,7 +25,8 @@ OPTIONS = @OPTIONS@ -D_REENTRANT
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
XLIB = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
WINELIB = $(WINESTUB) -L$(TOPOBJDIR) -lwine
DLL_LINK = @DLL_LINK@
WINELIB = $(WINESTUB) $(DLL_LINK)
LIBS = @LIBS@
YACC = @YACC@
LEX = @LEX@
......@@ -75,11 +76,58 @@ prog_manext = 1
conf_manext = 5
includedir = @includedir@/wine
OBJS = $(C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) $(ASM_SRCS:.S=.o) $(RC_SRCS:.rc=.o) \
$(SPEC_SRCS:.spec=.spec.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS)
OBJS = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \
$(ASM_SRCS:.S=.o) $(RC_SRCS:.rc=.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS)
LINTS = $(C_SRCS:.c=.ln)
# DLL list
DLLS = \
avifil32 \
comctl32 \
comdlg32 \
dciman32 \
dplayx \
dsound \
icmp \
imagehlp \
imm32 \
lz32 \
mcianim.drv \
mciavi.drv \
mcicda.drv \
mciseq.drv \
mciwave.drv \
midimap.drv \
msacm \
msacm.drv \
msacm32 \
msnet32 \
msvfw32 \
odbc32 \
ole32 \
oleaut32 \
olecli32 \
oledlg \
olesvr32 \
psapi \
rasapi32 \
setupx \
shell32 \
sound \
stress \
tapi32 \
version \
win32s \
win87em \
windebug \
wineoss.drv \
wing \
winspool \
wnaspi32 \
wsock32
# Implicit rules
.SUFFIXES:
......@@ -121,6 +169,8 @@ LINTS = $(C_SRCS:.c=.ln)
.c.ln:
$(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 )
.PHONY: all install uninstall clean distclean depend dummy
# Rule to rebuild the resource compiler
$(WRC) check_wrc:
......@@ -166,6 +216,36 @@ Makefile: Makefile.in $(TOPSRCDIR)/configure
all: Makefile
# Rules for checking that no imports are missing
IMPORTLIBS = $(IMPORTS:%=$(DLLDIR)/lib%.$(LIBEXT))
checklink_so checklink_a: lib$(MODULE).$(LIBEXT) $(IMPORTLIBS)
$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -l$(MODULE) -L$(DLLDIR) $(IMPORTS:%=-l%) -L$(TOPOBJDIR) -lwine $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS) && $(RM) checklink
checklink:: $(LIBEXT:%=checklink_%)
$(IMPORTLIBS): dummy
@cd $(DLLDIR) && $(MAKE) `basename $@`
# Rules for installation
install_so: lib$(MODULE).so.$(SOVERSION)
[ -d $(libdir) ] || $(MKDIR) $(libdir)
$(INSTALL_PROGRAM) lib$(MODULE).so.$(SOVERSION) $(libdir)/lib$(MODULE).so.$(SOVERSION)
cd $(libdir) && $(RM) lib$(MODULE).so && $(LN_S) lib$(MODULE).so.$(SOVERSION) lib$(MODULE).so
install_a: lib$(MODULE).a
[ -d $(libdir) ] || $(MKDIR) $(libdir)
$(INSTALL_DATA) lib$(MODULE).a $(libdir)/lib$(MODULE).a
uninstall_so uninstall_a:
cd $(libdir) && $(RM) lib$(MODULE).so lib$(MODULE).so.$(SOVERSION) lib$(MODULE).a
install:: $(LIBEXT:%=install_%)
uninstall:: $(LIBEXT:%=uninstall_%)
# Rules for auto documentation
man: $(C_SRCS)
......
Makefile.in
View file @ 318f4cef
# This Makefile understands the following targets:
#
# all (default): build wine
# lib: build libwine
# clean: remove all intermediate files
# distclean: also remove all files created by configure
# install: install everything
......@@ -11,19 +10,13 @@
# manpages: compile manpages for Wine API
#
# Main target to build
MAIN_TARGET = @MAIN_TARGET@
LIB_TARGET = @LIB_TARGET@
LIB_TYPE = @LIB_TYPE@
ALT_LINK = @ALT_LINK@
# Directories
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = .
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = wine
SOVERSION = 1.0
......@@ -36,56 +29,13 @@ LIBSUBDIRS = \
console \
debugger \
dlls/advapi32 \
dlls/avifil32 \
dlls/comctl32 \
dlls/commdlg \
dlls/crtdll \
dlls/dciman32 \
dlls/display \
dlls/dplayx \
dlls/dsound \
dlls/icmp \
dlls/imagehlp \
dlls/imm32 \
dlls/lzexpand \
dlls/mouse \
dlls/mpr \
dlls/msacm \
dlls/msacm32 \
dlls/msnet32 \
dlls/msvideo \
dlls/ntdll \
dlls/odbc32 \
dlls/ole32 \
dlls/oleaut32 \
dlls/olecli \
dlls/oledlg \
dlls/olesvr \
dlls/psapi \
dlls/rasapi32 \
dlls/setupx \
dlls/shell32 \
dlls/sound \
dlls/stress \
dlls/tapi32 \
dlls/version \
dlls/win32s \
dlls/win87em \
dlls/winaspi \
dlls/windebug \
dlls/wing \
dlls/winmm \
dlls/winmm/mcianim \
dlls/winmm/mciavi \
dlls/winmm/mcicda \
dlls/winmm/mciseq \
dlls/winmm/mciwave \
dlls/winmm/midimap \
dlls/winmm/wavemap \
dlls/winmm/wineoss \
dlls/winsock \
dlls/winspool \
dlls/wnaspi32 \
files \
graphics \
graphics/enhmetafiledrv \
......@@ -135,18 +85,19 @@ BUILDSUBDIRS = \
$(TOOLSUBDIRS) \
$(LIBSUBDIRS) \
$(X11SUBDIRS) \
$(DLLDIR) \
$(EMUSUBDIRS) \
$(PROGSUBDIRS) \
$(DOCSUBDIRS)
# Sub-directories to run make depend into
DEPENDSUBDIRS = $(LIBSUBDIRS) $(X11SUBDIRS) $(EMUSUBDIRS) $(DOCSUBDIRS)
DEPENDSUBDIRS = $(LIBSUBDIRS) $(X11SUBDIRS) $(DLLDIR) $(EMUSUBDIRS) $(DOCSUBDIRS)
# Sub-directories to run make install into
INSTALLSUBDIRS = $(DOCSUBDIRS) $(INCSUBDIRS)
INSTALLSUBDIRS = $(DLLDIR) $(DOCSUBDIRS) $(INCSUBDIRS)
# Sub-directories to run make lint into
LINTSUBDIRS = $(LIBSUBDIRS) $(X11SUBDIRS) $(EMUSUBDIRS) $(DOCSUBDIRS)
LINTSUBDIRS = $(LIBSUBDIRS) $(X11SUBDIRS) $(DLLDIR) $(EMUSUBDIRS) $(DOCSUBDIRS)
# Extra sub-directories to clean
CLEANSUBDIRS = dlls include include/bitmaps include/wine
......@@ -156,56 +107,13 @@ LIBOBJS = \
console/console.o \
debugger/debugger.o \
dlls/advapi32/advapi32.o \
dlls/avifil32/avifil32.o \
dlls/comctl32/comctl32.o \
dlls/commdlg/commdlg.o \
dlls/crtdll/crtdll.o \
dlls/dciman32/dciman32.o \
dlls/display/display.o \
dlls/dplayx/dplayx.o \
dlls/dsound/dsound.o \
dlls/icmp/icmp.o \
dlls/imagehlp/imagehlp.o \
dlls/imm32/imm32.o \
dlls/lzexpand/lzexpand.o \
dlls/mouse/mouse.o \
dlls/mpr/mpr.o \
dlls/msacm/msacm.o \
dlls/msacm32/msacm32.o \
dlls/msnet32/msnet32.o \
dlls/msvideo/msvideo.o \
dlls/ntdll/ntdll.o \
dlls/odbc32/odbc32.o \
dlls/ole32/ole32.o \
dlls/oleaut32/oleaut32.o \
dlls/olecli/olecli.o \
dlls/oledlg/oledlg.o \
dlls/olesvr/olesvr.o \
dlls/psapi/psapi.o \
dlls/rasapi32/rasapi32.o \
dlls/setupx/setupx.o \
dlls/shell32/shell32.o \
dlls/sound/sound.o \
dlls/stress/stress.o \
dlls/tapi32/tapi32.o \
dlls/version/version.o \
dlls/win32s/win32s.o \
dlls/win87em/win87em.o \
dlls/winaspi/winaspi.o \
dlls/windebug/windebug.o \
dlls/wing/wing.o \
dlls/winmm/winmm.o \
dlls/winmm/mcianim/mcianim.drv.o \
dlls/winmm/mciavi/mciavi.drv.o \
dlls/winmm/mcicda/mcicda.drv.o \
dlls/winmm/mciseq/mciseq.drv.o \
dlls/winmm/mciwave/mciwave.drv.o \
dlls/winmm/midimap/midimap.drv.o \
dlls/winmm/wavemap/msacm.drv.o \
dlls/winmm/wineoss/wineoss.drv.o \
dlls/winsock/winsock.o \
dlls/winspool/winspool.o \
dlls/wnaspi32/wnaspi32.o \
files/files.o \
graphics/graphics.o \
graphics/enhmetafiledrv/enhmetafiledrv.o \
......@@ -237,9 +145,13 @@ X11OBJS = \
EMUOBJS = \
miscemu/miscemu.o
DLLOBJS = $(DLLS:%=dlls/lib%.@LIBEXT@)
EXTRA_OBJS = $(LIBOBJS) $(X11OBJS)
all: Makefile Make.rules $(PROGRAMS) $(MAIN_TARGET)
EMU_TARGET = @EMU_TARGET@
all: Make.rules $(PROGRAMS) $(EMU_TARGET)
@echo "Wine build complete."
LIBLINTS = $(LIBOBJS:.o=.ln)
......@@ -253,48 +165,36 @@ WINAPI_CHECK_EXTRA_FLAGS = --global
@MAKE_RULES@
all: lib$(MODULE).$(LIBEXT) $(DLLOBJS)
Make.rules: Make.rules.in configure
@echo $? is newer than 'Make.rules', please rerun ./configure!
@exit 1
install:: install_$(MAIN_TARGET)
emu: wine
lib: $(LIBSUBDIRS) $(X11SUBDIRS) $(LIB_TARGET)
wine wine.sym: $(LIB_TARGET) $(EMUOBJS) $(X11OBJS) $(LIBOBJS)
$(CC) -o wine $(EMUOBJS) $(ALT_LINK) $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS)
wine wine.sym: lib$(MODULE).$(LIBEXT) $(DLLOBJS) $(EMUOBJS)
$(CC) -o wine $(EMUOBJS) $(DLL_LINK) $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS)
nm -n wine | grep -v _compiled >wine.sym
llib-lwine.ln : $(LIBLINTS) $(X11LINTS)
$(LINT) $(ALLLINTFLAGS) -owine $(LIBLINTS) $(X11LINTS)
install_emu: install_lib
install_wine: wine
[ -d $(bindir) ] || $(MKDIR) $(bindir)
[ -d $(libdir) ] || $(MKDIR) $(libdir)
[ -f wine.sym ] && $(INSTALL_DATA) wine.sym $(libdir)/wine.sym
$(INSTALL_PROGRAM) wine $(bindir)/wine
install_lib: install_$(LIB_TYPE)
install_nolib: dummy
[ -d $(libdir) ] || $(MKDIR) $(libdir)
if [ -f wine.sym ]; then $(INSTALL_DATA) wine.sym $(libdir)/wine.sym; fi
install:: $(PROGRAMS) $(EMU_TARGET:%=install_%)
[ -d $(bindir) ] || $(MKDIR) $(bindir)
$(INSTALL_PROGRAM) server/wineserver $(bindir)/wineserver
$(INSTALL_PROGRAM) windows/x11drv/wineclipsrv $(bindir)/wineclipsrv
$(INSTALL_PROGRAM) loader/dos/dosmod $(bindir)/dosmod
install_dll: install_nolib
$(INSTALL_PROGRAM) $(LIB_TARGET) $(libdir)
$(LDCONFIG) || (cd $(libdir) ; $(RM) libwine.so ; $(LN_S) $(LIB_TARGET) libwine.so)
install_static: install_nolib
$(INSTALL_DATA) $(LIB_TARGET) $(libdir)
uninstall::
cd $(libdir) && $(RM) $(LIB_TARGET) libwine.a libwine.so wine.sym
cd $(libdir) && $(RM) libwine.a libwine.so libwine.so.$(SOVERSION) wine.sym
cd $(bindir) && $(RM) wine wineserver wineclipsrv dosmod
$(X11OBJS) $(EMUOBJS) $(LIBOBJS) $(PROGRAMS): $(TOOLSUBDIRS) dummy
$(X11OBJS) $(EMUOBJS) $(LIBOBJS) $(DLLOBJS) $(PROGRAMS): $(TOOLSUBDIRS) dummy
@cd `dirname $@` && $(MAKE) `basename $@`
$(BUILDSUBDIRS): dummy
......@@ -311,13 +211,17 @@ uninstall_programs: dummy
install::
for i in $(INSTALLSUBDIRS); do (cd $$i && $(MAKE) install) || exit 1; done
-$(LDCONFIG)
uninstall::
for i in $(INSTALLSUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit 1; done
depend:: dummy
depend::
for i in $(DEPENDSUBDIRS); do (cd $$i && $(MAKE) depend) || exit 1; done
checklink::
@cd dlls && $(MAKE) checklink
TAGS etags:
etags `find $(TOPSRCDIR) -name '*.[chS]' -print | grep -v dbgmain`
......
configure.in
View file @ 318f4cef
......@@ -13,22 +13,18 @@ test -z "$PROGEXT" && PROGEXT="" AC_SUBST(PROGEXT)
dnl **** Command-line arguments ****
dnl Default values
MAIN_TARGET=emu
LIB_TYPE=dll # one of static, dll, nolib
EMU_TARGET=wine
LIBEXT=so # library type .so or .a
TRACE_MSGS=yes # the TRACE() macro
DEBUG_MSGS=yes # the TRACE(), WARN(), and FIXME() macros.
AC_ARG_ENABLE(emulator,
[ --disable-emulator build only the Wine library, not the emulator],
[if test "$enableval" = "no"; then MAIN_TARGET="lib"; fi])
[if test "$enableval" = "no"; then EMU_TARGET=""; fi])
AC_ARG_ENABLE(dll,
[ --disable-dll build static libraries instead of DLLs],
[if test "$enableval" = "no"; then LIB_TYPE="static"; fi])
AC_ARG_ENABLE(lib,
[ --disable-lib build the Wine without building libwine.a],
[if test "$enableval" = "no"; then LIB_TYPE="nolib"; fi])
[if test "$enableval" = "no"; then LIBEXT="a"; fi])
AC_ARG_ENABLE(debug,
[ --disable-debug compile out all debugging messages],
......@@ -41,7 +37,7 @@ AC_ARG_ENABLE(trace,
AC_ARG_WITH(reentrant-x,
[ --without-reentrant-x compile for use with non-reentrant X libraries])
AC_SUBST(MAIN_TARGET)
AC_SUBST(EMU_TARGET)
AC_SUBST(OPTIONS)
if test "$DEBUG_MSGS" = "no"
......@@ -67,7 +63,7 @@ AC_PROG_RANLIB
AC_PROG_INSTALL
AC_PROG_LN_S
AC_CHECK_PROG(C2MAN,c2man,c2man,true)
AC_PATH_PROG(LDCONFIG, ldconfig, false, /sbin:/usr/sbin:$PATH)
AC_PATH_PROG(LDCONFIG, ldconfig, true, /sbin:/usr/sbin:$PATH)
dnl Check for lint
AC_CHECK_PROGS(LINT, lclint lint)
......@@ -377,7 +373,7 @@ fi
dnl **** Check for working dll ****
LDSHARED=""
if test "$LIB_TYPE" = "dll"
if test "$LIBEXT" = "so"
then
AC_CACHE_CHECK("whether we can build a Linux dll",
ac_cv_c_dll_linux,
......@@ -416,56 +412,44 @@ then
fi
if test "$ac_cv_c_dll_linux" = "no" -a "$ac_cv_c_dll_unixware" = "no" -a "$ac_cv_c_dll_netbsd" = "no"
then
LIB_TYPE="static"
LIBEXT="a"
fi
fi
DLLFLAGS=""
BUILDFLAGS=""
LIBEXT="a"
DLL_LINK="-L\$(DLLDIR) \$(DLLS:%=-l%) -L\$(TOPOBJDIR) -lwine"
if test "$LIB_TYPE" = "nolib"; then
ALT_LINK="\$(LIBOBJS) \$(X11OBJS)"
LIB_TARGET=""
if test "$LIBEXT" = "so"; then
BUILDFLAGS="-pic"
DLLFLAGS="-fPIC"
else
ALT_LINK="-L\$(TOPOBJDIR) -lwine"
if test "$LIB_TYPE" = "dll"; then
LIB_TARGET="libwine.so"
BUILDFLAGS="-pic"
DLLFLAGS="-fPIC"
LIBEXT="so"
else
LIB_TARGET="libwine.a"
AC_CACHE_CHECK([whether the linker supports --[[no]]-whole-archive (Linux)],
ac_cv_c_whole_archive,
AC_CACHE_CHECK([whether the linker supports --[[no]]-whole-archive (Linux)],
ac_cv_c_whole_archive,
[saved_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wl,--whole-archive -Wl,--no-whole-archive"
AC_TRY_LINK(,[return 1],ac_cv_c_whole_archive="yes",ac_cv_c_whole_archive="no")
CFLAGS=$saved_cflags
])
if test "$ac_cv_c_whole_archive" = "yes"
then
ALT_LINK="-Wl,--whole-archive -L\$(TOPOBJDIR) -lwine -Wl,--no-whole-archive"
else
AC_CACHE_CHECK([whether the linker supports -z {all,default}extract (Linux)],
ac_cv_c_allextract,
if test "$ac_cv_c_whole_archive" = "yes"
then
DLL_LINK="-Wl,--whole-archive $DLL_LINK -Wl,--no-whole-archive"
else
AC_CACHE_CHECK([whether the linker supports -z {all,default}extract (Linux)],
ac_cv_c_allextract,
[saved_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wl,-z,allextract -Wl,-z,defaultextract"
AC_TRY_LINK(,[return 1],ac_cv_c_allextract="yes",ac_cv_c_allextract="no")
CFLAGS=$saved_cflags
])
if test "$ac_cv_c_allextract" = "yes"
then
ALT_LINK="-Wl,-z,allextract -L\$(TOPOBJDIR) -lwine -Wl,-z,defaultextract"
fi
if test "$ac_cv_c_allextract" = "yes"
then
DLL_LINK="-Wl,-z,allextract $DLL_LINK -Wl,-z,defaultextract"
fi
fi
fi
AC_SUBST(LIB_TARGET)
AC_SUBST(LIB_TYPE)
AC_SUBST(ALT_LINK)
AC_SUBST(DLL_LINK)
AC_SUBST(BUILDFLAGS)
AC_SUBST(DLLFLAGS)
AC_SUBST(LDSHARED)
......
debugger/Makefile.in
View file @ 318f4cef
......@@ -43,7 +43,4 @@ y.tab.c y.tab.h: dbg.y
lex.yy.c: debug.l
$(LEX) -8 -I $(SRCDIR)/debug.l
clean::
$(RM) y.tab.c y.tab.h lex.yy.c
### Dependencies:
dlls/Makefile.in
View file @ 318f4cef
SUBDIRS = \
advapi32 \
avifil32 \
comctl32 \
commdlg \
crtdll \
dciman32 \
display \
dplayx \
dsound \
icmp \
imagehlp \
imm32 \
lzexpand \
mouse \
mpr \
msacm \
msacm32 \
msnet32 \
msvideo \
ntdll \
odbc32 \
ole32 \
oleaut32 \
olecli \
oledlg \
olesvr \
psapi \
setupx \
shell32 \
sound \
stress \
tapi32 \
version \
win32s \
win87em \
winaspi \
windebug \
wing \
winmm \
winsock \
winspool \
wnaspi32
all: $(SUBDIRS)
$(SUBDIRS): dummy
@cd $@; $(MAKE)
depend:
for i in $(SUBDIRS); do (cd $$i && $(MAKE) depend) || exit 1; done
install:
for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit 1; done
uninstall:
for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit 1; done
clean:
for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit 1; done
dummy:
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ..
SRCDIR = @srcdir@
VPATH = @srcdir@
DLLFILES = \
avifil32/libavifil32.@LIBEXT@ \
comctl32/libcomctl32.@LIBEXT@ \
commdlg/libcomdlg32.@LIBEXT@ \
dciman32/libdciman32.@LIBEXT@ \
dplayx/libdplayx.@LIBEXT@ \
dsound/libdsound.@LIBEXT@ \
icmp/libicmp.@LIBEXT@ \
imagehlp/libimagehlp.@LIBEXT@ \
imm32/libimm32.@LIBEXT@ \
lzexpand/liblz32.@LIBEXT@ \
msacm/libmsacm.@LIBEXT@ \
msacm32/libmsacm32.@LIBEXT@ \
msnet32/libmsnet32.@LIBEXT@ \
msvideo/libmsvfw32.@LIBEXT@ \
odbc32/libodbc32.@LIBEXT@ \
ole32/libole32.@LIBEXT@ \
oleaut32/liboleaut32.@LIBEXT@ \
olecli/libolecli32.@LIBEXT@ \
oledlg/liboledlg.@LIBEXT@ \
olesvr/libolesvr32.@LIBEXT@ \
psapi/libpsapi.@LIBEXT@ \
rasapi32/librasapi32.@LIBEXT@ \
setupx/libsetupx.@LIBEXT@ \
shell32/libshell32.@LIBEXT@ \
sound/libsound.@LIBEXT@ \
stress/libstress.@LIBEXT@ \
tapi32/libtapi32.@LIBEXT@ \
version/libversion.@LIBEXT@ \
win32s/libwin32s.@LIBEXT@ \
win87em/libwin87em.@LIBEXT@ \
windebug/libwindebug.@LIBEXT@ \
wing/libwing.@LIBEXT@ \
winmm/mcianim/libmcianim.drv.@LIBEXT@ \
winmm/mciavi/libmciavi.drv.@LIBEXT@ \
winmm/mcicda/libmcicda.drv.@LIBEXT@ \
winmm/mciseq/libmciseq.drv.@LIBEXT@ \
winmm/mciwave/libmciwave.drv.@LIBEXT@ \
winmm/midimap/libmidimap.drv.@LIBEXT@ \
winmm/wavemap/libmsacm.drv.@LIBEXT@ \
winmm/wineoss/libwineoss.drv.@LIBEXT@ \
winsock/libwsock32.@LIBEXT@ \
winspool/libwinspool.@LIBEXT@ \
wnaspi32/libwnaspi32.@LIBEXT@
all: dlls
@MAKE_RULES@
dlls: $(DLLS:%=lib%.@LIBEXT@)
# Map library name to directory
libavifil32.@LIBEXT@: avifil32/libavifil32.@LIBEXT@
$(RM) $@
$(LN_S) avifil32/libavifil32.@LIBEXT@ $@
libcomctl32.@LIBEXT@: comctl32/libcomctl32.@LIBEXT@
$(RM) $@
$(LN_S) comctl32/libcomctl32.@LIBEXT@ $@
libcomdlg32.@LIBEXT@: commdlg/libcomdlg32.@LIBEXT@
$(RM) $@
$(LN_S) commdlg/libcomdlg32.@LIBEXT@ $@
libdciman32.@LIBEXT@: dciman32/libdciman32.@LIBEXT@
$(RM) $@
$(LN_S) dciman32/libdciman32.@LIBEXT@ $@
libdplayx.@LIBEXT@: dplayx/libdplayx.@LIBEXT@
$(RM) $@
$(LN_S) dplayx/libdplayx.@LIBEXT@ $@
libdsound.@LIBEXT@: dsound/libdsound.@LIBEXT@
$(RM) $@
$(LN_S) dsound/libdsound.@LIBEXT@ $@
libicmp.@LIBEXT@: icmp/libicmp.@LIBEXT@
$(RM) $@
$(LN_S) icmp/libicmp.@LIBEXT@ $@
libimagehlp.@LIBEXT@: imagehlp/libimagehlp.@LIBEXT@
$(RM) $@
$(LN_S) imagehlp/libimagehlp.@LIBEXT@ $@
libimm32.@LIBEXT@: imm32/libimm32.@LIBEXT@
$(RM) $@
$(LN_S) imm32/libimm32.@LIBEXT@ $@
liblz32.@LIBEXT@: lzexpand/liblz32.@LIBEXT@
$(RM) $@
$(LN_S) lzexpand/liblz32.@LIBEXT@ $@
libmcianim.drv.@LIBEXT@: winmm/mcianim/libmcianim.drv.@LIBEXT@
$(RM) $@
$(LN_S) winmm/mcianim/libmcianim.drv.@LIBEXT@ $@
libmciavi.drv.@LIBEXT@: winmm/mciavi/libmciavi.drv.@LIBEXT@
$(RM) $@
$(LN_S) winmm/mciavi/libmciavi.drv.@LIBEXT@ $@
libmcicda.drv.@LIBEXT@: winmm/mcicda/libmcicda.drv.@LIBEXT@
$(RM) $@
$(LN_S) winmm/mcicda/libmcicda.drv.@LIBEXT@ $@
libmciseq.drv.@LIBEXT@: winmm/mciseq/libmciseq.drv.@LIBEXT@
$(RM) $@
$(LN_S) winmm/mciseq/libmciseq.drv.@LIBEXT@ $@
libmciwave.drv.@LIBEXT@: winmm/mciwave/libmciwave.drv.@LIBEXT@
$(RM) $@
$(LN_S) winmm/mciwave/libmciwave.drv.@LIBEXT@ $@
libmidimap.drv.@LIBEXT@: winmm/midimap/libmidimap.drv.@LIBEXT@
$(RM) $@
$(LN_S) winmm/midimap/libmidimap.drv.@LIBEXT@ $@
libmsacm.@LIBEXT@: msacm/libmsacm.@LIBEXT@
$(RM) $@
$(LN_S) msacm/libmsacm.@LIBEXT@ $@
libmsacm.drv.@LIBEXT@: winmm/wavemap/libmsacm.drv.@LIBEXT@
$(RM) $@
$(LN_S) winmm/wavemap/libmsacm.drv.@LIBEXT@ $@
libmsacm32.@LIBEXT@: msacm32/libmsacm32.@LIBEXT@
$(RM) $@
$(LN_S) msacm32/libmsacm32.@LIBEXT@ $@
libmsnet32.@LIBEXT@: msnet32/libmsnet32.@LIBEXT@
$(RM) $@
$(LN_S) msnet32/libmsnet32.@LIBEXT@ $@
libmsvfw32.@LIBEXT@: msvideo/libmsvfw32.@LIBEXT@
$(RM) $@
$(LN_S) msvideo/libmsvfw32.@LIBEXT@ $@
libodbc32.@LIBEXT@: odbc32/libodbc32.@LIBEXT@
$(RM) $@
$(LN_S) odbc32/libodbc32.@LIBEXT@ $@
libole32.@LIBEXT@: ole32/libole32.@LIBEXT@
$(RM) $@
$(LN_S) ole32/libole32.@LIBEXT@ $@
liboleaut32.@LIBEXT@: oleaut32/liboleaut32.@LIBEXT@
$(RM) $@
$(LN_S) oleaut32/liboleaut32.@LIBEXT@ $@
libolecli32.@LIBEXT@: olecli/libolecli32.@LIBEXT@
$(RM) $@
$(LN_S) olecli/libolecli32.@LIBEXT@ $@
liboledlg.@LIBEXT@: oledlg/liboledlg.@LIBEXT@
$(RM) $@
$(LN_S) oledlg/liboledlg.@LIBEXT@ $@
libolesvr32.@LIBEXT@: olesvr/libolesvr32.@LIBEXT@
$(RM) $@
$(LN_S) olesvr/libolesvr32.@LIBEXT@ $@
libpsapi.@LIBEXT@: psapi/libpsapi.@LIBEXT@
$(RM) $@
$(LN_S) psapi/libpsapi.@LIBEXT@ $@
librasapi32.@LIBEXT@: rasapi32/librasapi32.@LIBEXT@
$(RM) $@
$(LN_S) rasapi32/librasapi32.@LIBEXT@ $@
libsetupx.@LIBEXT@: setupx/libsetupx.@LIBEXT@
$(RM) $@
$(LN_S) setupx/libsetupx.@LIBEXT@ $@
libshell32.@LIBEXT@: shell32/libshell32.@LIBEXT@
$(RM) $@
$(LN_S) shell32/libshell32.@LIBEXT@ $@
libsound.@LIBEXT@: sound/libsound.@LIBEXT@
$(RM) $@
$(LN_S) sound/libsound.@LIBEXT@ $@
libstress.@LIBEXT@: stress/libstress.@LIBEXT@
$(RM) $@
$(LN_S) stress/libstress.@LIBEXT@ $@
libtapi32.@LIBEXT@: tapi32/libtapi32.@LIBEXT@
$(RM) $@
$(LN_S) tapi32/libtapi32.@LIBEXT@ $@
libversion.@LIBEXT@: version/libversion.@LIBEXT@
$(RM) $@
$(LN_S) version/libversion.@LIBEXT@ $@
libwin32s.@LIBEXT@: win32s/libwin32s.@LIBEXT@
$(RM) $@
$(LN_S) win32s/libwin32s.@LIBEXT@ $@
libwin87em.@LIBEXT@: win87em/libwin87em.@LIBEXT@
$(RM) $@
$(LN_S) win87em/libwin87em.@LIBEXT@ $@
libwindebug.@LIBEXT@: windebug/libwindebug.@LIBEXT@
$(RM) $@
$(LN_S) windebug/libwindebug.@LIBEXT@ $@
libwineoss.drv.@LIBEXT@: winmm/wineoss/libwineoss.drv.@LIBEXT@
$(RM) $@
$(LN_S) winmm/wineoss/libwineoss.drv.@LIBEXT@ $@
libwing.@LIBEXT@: wing/libwing.@LIBEXT@
$(RM) $@
$(LN_S) wing/libwing.@LIBEXT@ $@
libwinspool.@LIBEXT@: winspool/libwinspool.@LIBEXT@
$(RM) $@
$(LN_S) winspool/libwinspool.@LIBEXT@ $@
libwnaspi32.@LIBEXT@: wnaspi32/libwnaspi32.@LIBEXT@
$(RM) $@
$(LN_S) wnaspi32/libwnaspi32.@LIBEXT@ $@
libwsock32.@LIBEXT@: winsock/libwsock32.@LIBEXT@
$(RM) $@
$(LN_S) winsock/libwsock32.@LIBEXT@ $@
$(DLLFILES): dummy
@cd `dirname $@` && $(MAKE)
$(DLLFILES:%=%_depend_): dummy
@cd `dirname $@` && $(MAKE) depend
$(DLLFILES:%=%_install_): dummy
@cd `dirname $@` && $(MAKE) install
$(DLLFILES:%=%_uninstall_): dummy
@cd `dirname $@` && $(MAKE) uninstall
$(DLLFILES:%=%_checklink_): dummy
@cd `dirname $@` && $(MAKE) checklink
$(DLLFILES:%=%_clean_): dummy
@cd `dirname $@` && $(MAKE) clean
depend:: $(DLLFILES:%=%_depend_)
install:: $(DLLFILES:%=%_install_)
uninstall:: $(DLLFILES:%=%_uninstall_)
checklink:: $(DLLFILES:%=%_checklink_)
clean:: $(DLLFILES:%=%_clean_)
$(RM) $(DLLLIBS)
dlls/avifil32/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libavifil32.so.1.0
dlls/avifil32/Makefile.in
View file @ 318f4cef
......@@ -3,16 +3,22 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = avifil32
SOVERSION = 1.0
IMPORTS = msvfw32
SPEC_SRCS = avifil32.spec avifile.spec
C_SRCS = \
avifile.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/comctl32/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libcomctl32.so.1.0
rsrc.s
dlls/comctl32/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = comctl32
SOVERSION = 1.0
WRCEXTRA = -s -p$(MODULE)
SPEC_SRCS = comctl32.spec
......@@ -38,10 +40,13 @@ C_SRCS = \
RC_SRCS= \
rsrc.rc
all: check_wrc $(MODULE).o
all: check_wrc lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
$(RC_SRCS:.rc=.s): $(WRC)
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/commdlg/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libcomdlg32.so.1.0
rsrc.s
dlls/commdlg/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,10 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = commdlg
LIBEXT = @LIBEXT@
MODULE = comdlg32
SOVERSION = 1.0
IMPORTS = shell32 ole32 comctl32 winspool
WRCEXTRA = -s -pcomdlg32
SPEC_SRCS = commdlg.spec comdlg32.spec
......@@ -24,10 +27,13 @@ C_SRCS = \
RC_SRCS= \
rsrc.rc
all: check_wrc $(MODULE).o
all: check_wrc lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
$(RC_SRCS:.rc=.s): $(WRC)
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/dciman32/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libdciman32.so.1.0
dlls/dciman32/Makefile.in
View file @ 318f4cef
......@@ -3,12 +3,17 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = dciman32
SOVERSION = 1.0
SPEC_SRCS = dciman32.spec
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/dplayx/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libdplayx.so.1.0
dlls/dplayx/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,10 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = dplayx
SOVERSION = 1.0
IMPORTS = ole32
SPEC_SRCS = dplay.spec dplayx.spec
......@@ -13,9 +16,12 @@ C_SRCS = dplay.c \
dplayx_main.c \
dplayx_global.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/dsound/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
dsound.spec.c
libdsound.so.1.0
dlls/dsound/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = dsound
SOVERSION = 1.0
SPEC_SRCS = \
dsound.spec
......@@ -11,9 +13,12 @@ SPEC_SRCS = \
C_SRCS = \
dsound_main.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/icmp/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
icmp.spec.c
libicmp.so.1.0
dlls/icmp/Makefile.in
View file @ 318f4cef
......@@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = icmp
SOVERSION = 1.0
SPEC_SRCS = icmp.spec
C_SRCS = icmp_main.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
......
dlls/imagehlp/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
imagehlp.spec.c
libimagehlp.so.1.0
dlls/imagehlp/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = imagehlp
SOVERSION = 1.0
SPEC_SRCS = imagehlp.spec
......@@ -16,9 +18,12 @@ C_SRCS = \
modify.c \
symbol.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/imm32/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
imm32.spec.c
libimm32.so.1.0
dlls/imm32/Makefile.in
View file @ 318f4cef
......@@ -3,15 +3,20 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = imm32
SOVERSION = 1.0
SPEC_SRCS = imm32.spec
C_SRCS = \
imm.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/lzexpand/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
liblz32.so.1.0
dlls/lzexpand/Makefile.in
View file @ 318f4cef
......@@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = lzexpand
LIBEXT = @LIBEXT@
MODULE = lz32
SOVERSION = 1.0
SPEC_SRCS = lz32.spec lzexpand.spec
C_SRCS = \
lzexpand_main.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/msacm/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libmsacm.so.1.0
dlls/msacm/Makefile.in
View file @ 318f4cef
......@@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = msacm
SOVERSION = 1.0
SPEC_SRCS = msacm.spec
C_SRCS = \
msacm_main.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/msacm32/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
msacm32.spec.c
libmsacm32.so.1.0
dlls/msacm32/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = msacm32
SOVERSION = 1.0
SPEC_SRCS = msacm32.spec
......@@ -15,9 +17,12 @@ C_SRCS = \
msacm32_main.c \
stream.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/msnet32/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
msnet32.spec.c
libmsnet32.so.1.0
dlls/msnet32/Makefile.in
View file @ 318f4cef
......@@ -3,12 +3,17 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = msnet32
SOVERSION = 1.0
SPEC_SRCS = msnet32.spec
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/msvideo/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libmsvfw32.so.1.0
dlls/msvideo/Makefile.in
View file @ 318f4cef
......@@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msvideo
LIBEXT = @LIBEXT@
MODULE = msvfw32
SOVERSION = 1.0
SPEC_SRCS = msvfw32.spec msvideo.spec
C_SRCS = \
msvideo_main.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/odbc32/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
odbc32.spec.c
libodbc32.so.1.0
dlls/odbc32/Makefile.in
View file @ 318f4cef
......@@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = odbc32
SOVERSION = 1.0
SPEC_SRCS = odbc32.spec
C_SRCS = \
proxyodbc.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/ole32/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libole32.so.1.0
dlls/ole32/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = ole32
SOVERSION = 1.0
SPEC_SRCS = ole32.spec ole2.spec storage.spec compobj.spec
......@@ -29,9 +31,12 @@ C_SRCS = \
storage.c \
storage32.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/ole32/defaulthandler.c
View file @ 318f4cef
......@@ -33,7 +33,6 @@
#include <assert.h>
#include "winbase.h"
#include "oleauto.h" /* for SysFreeString(BSTR) */
#include "winerror.h"
#include "ole2.h"
#include "wine/obj_oleview.h"
......@@ -95,8 +94,8 @@ struct DefaultHandler
/*
* Name of the container and object contained
*/
BSTR containerApp;
BSTR containerObj;
LPWSTR containerApp;
LPWSTR containerObj;
};
......@@ -500,13 +499,13 @@ static void DefaultHandler_Destroy(
*/
if (ptrToDestroy->containerApp!=NULL)
{
SysFreeString(ptrToDestroy->containerApp);
HeapFree( GetProcessHeap(), 0, ptrToDestroy->containerApp );
ptrToDestroy->containerApp = NULL;
}
if (ptrToDestroy->containerObj!=NULL)
{
SysFreeString(ptrToDestroy->containerObj);
HeapFree( GetProcessHeap(), 0, ptrToDestroy->containerObj );
ptrToDestroy->containerObj = NULL;
}
......@@ -814,13 +813,13 @@ static HRESULT WINAPI DefaultHandler_SetHostNames(
*/
if (this->containerApp!=NULL)
{
SysFreeString(this->containerApp);
HeapFree( GetProcessHeap(), 0, this->containerApp );
this->containerApp = NULL;
}
if (this->containerObj!=NULL)
{
SysFreeString(this->containerObj);
HeapFree( GetProcessHeap(), 0, this->containerObj );
this->containerObj = NULL;
}
......@@ -828,11 +827,18 @@ static HRESULT WINAPI DefaultHandler_SetHostNames(
* Copy the string supplied.
*/
if (szContainerApp != NULL)
this->containerApp = SysAllocString(szContainerApp);
{
if ((this->containerApp = HeapAlloc( GetProcessHeap(), 0,
(lstrlenW(szContainerApp) + 1) * sizeof(WCHAR) )))
lstrcpyW( this->containerApp, szContainerApp );
}
if (szContainerObj != NULL)
this->containerObj = SysAllocString(szContainerObj);
{
if ((this->containerObj = HeapAlloc( GetProcessHeap(), 0,
(lstrlenW(szContainerObj) + 1) * sizeof(WCHAR) )))
lstrcpyW( this->containerObj, szContainerObj );
}
return S_OK;
}
......
dlls/oleaut32/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
liboleaut32.so.1.0
dlls/oleaut32/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,10 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = oleaut32
SOVERSION = 1.0
IMPORTS = ole32 comctl32
SPEC_SRCS = oleaut32.spec ole2disp.spec typelib.spec
......@@ -16,9 +19,12 @@ C_SRCS = \
typelib.c \
variant.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/olecli/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libolecli32.so.1.0
dlls/olecli/Makefile.in
View file @ 318f4cef
......@@ -3,16 +3,22 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = olecli
LIBEXT = @LIBEXT@
MODULE = olecli32
SOVERSION = 1.0
IMPORTS = olesvr32 ole32
SPEC_SRCS = olecli32.spec olecli.spec
C_SRCS = \
olecli_main.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/oledlg/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
liboledlg.so.1.0
dlls/oledlg/Makefile.in
View file @ 318f4cef
......@@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = oledlg
SOVERSION = 1.0
SPEC_SRCS = oledlg.spec
C_SRCS = \
oledlg_main.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/olesvr/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libolesvr32.so.1.0
dlls/olesvr/Makefile.in
View file @ 318f4cef
......@@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = olesvr
LIBEXT = @LIBEXT@
MODULE = olesvr32
SOVERSION = 1.0
SPEC_SRCS = olesvr32.spec olesvr.spec
C_SRCS = \
olesvr_main.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/psapi/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libpsapi.so.1.0
dlls/psapi/Makefile.in
View file @ 318f4cef
......@@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = psapi
SOVERSION = 1.0
SPEC_SRCS = psapi.spec
C_SRCS = \
psapi_main.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/rasapi32/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
librasapi32.so.1.0
dlls/rasapi32/Makefile.in
View file @ 318f4cef
......@@ -3,15 +3,20 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = rasapi32
SOVERSION = 1.0
SPEC_SRCS = rasapi32.spec rasapi16.spec
C_SRCS = rasapi.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/setupx/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libsetupx.so.1.0
dlls/setupx/Makefile.in
View file @ 318f4cef
......@@ -3,15 +3,20 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = setupx
SOVERSION = 1.0
SPEC_SRCS = setupx.spec
C_SRCS = \
setupx_main.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/shell32/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libshell32.so.1.0
shres.s
dlls/shell32/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,10 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = shell32
SOVERSION = 1.0
IMPORTS = ole32 comctl32
WRCEXTRA = -s -p$(MODULE)
SPEC_SRCS = \
......@@ -42,11 +45,14 @@ RC_SRCS= \
#GEN_ASM_SRCS = \
# shellres.s
all: check_wrc $(MODULE).o
all: check_wrc lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
$(RC_SRCS:.rc=.s): $(WRC)
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/sound/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libsound.so.1.0
dlls/sound/Makefile.in
View file @ 318f4cef
......@@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = sound
SOVERSION = 1.0
SPEC_SRCS = sound.spec
C_SRCS = \
sound_main.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/stress/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libstress.so.1.0
dlls/stress/Makefile.in
View file @ 318f4cef
......@@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = stress
SOVERSION = 1.0
SPEC_SRCS = stress.spec
C_SRCS = \
stress_main.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/tapi32/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
tapi32.spec.c
libtapi32.so.1.0
dlls/tapi32/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = tapi32
SOVERSION = 1.0
SPEC_SRCS = tapi32.spec
......@@ -12,9 +14,12 @@ C_SRCS = \
line.c \
phone.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/version/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libversion.so.1.0
dlls/version/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,10 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = version
SOVERSION = 1.0
IMPORTS = lz32
SPEC_SRCS = ver.spec version.spec
......@@ -13,8 +16,11 @@ C_SRCS = \
resource.c \
ver16.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/win32s/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libwin32s.so.1.0
dlls/win32s/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = win32s
SOVERSION = 1.0
SPEC_SRCS = w32sys.spec win32s16.spec w32skrnl.spec
......@@ -12,9 +14,12 @@ C_SRCS = \
w32sys.c \
win32s16.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/win87em/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libwin87em.so.1.0
dlls/win87em/Makefile.in
View file @ 318f4cef
......@@ -3,15 +3,20 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = win87em
SOVERSION = 1.0
SPEC_SRCS = win87em.spec
C_SRCS = \
emulate.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/windebug/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libwindebug.so.1.0
dlls/windebug/Makefile.in
View file @ 318f4cef
......@@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = windebug
SOVERSION = 1.0
SPEC_SRCS = windebug.spec
C_SRCS = \
windebug_main.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/wing/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libwing.so.1.0
dlls/wing/Makefile.in
View file @ 318f4cef
......@@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = wing
SOVERSION = 1.0
SPEC_SRCS = wing.spec
C_SRCS = \
wing_main.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/winmm/mcianim/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
mcianim.spec.c
libmcianim.drv.so.1.0
dlls/winmm/mcianim/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = mcianim.drv
SOVERSION = 1.0
SPEC_SRCS = \
mcianim.spec
......@@ -11,11 +13,11 @@ SPEC_SRCS = \
C_SRCS = \
mcianim.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
call32.s: $(BUILD)
$(BUILD) @BUILDFLAGS@ -o $@ -call32
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/winmm/mciavi/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
mciavi.spec.c
libmciavi.drv.so.1.0
dlls/winmm/mciavi/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = mciavi.drv
SOVERSION = 1.0
SPEC_SRCS = \
mciavi.spec
......@@ -11,11 +13,11 @@ SPEC_SRCS = \
C_SRCS = \
mciavi.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
call32.s: $(BUILD)
$(BUILD) @BUILDFLAGS@ -o $@ -call32
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/winmm/mcicda/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
mcicda.spec.c
libmcicda.drv.so.1.0
dlls/winmm/mcicda/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = mcicda.drv
SOVERSION = 1.0
SPEC_SRCS = \
mcicda.spec
......@@ -11,11 +13,11 @@ SPEC_SRCS = \
C_SRCS = \
mcicda.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
call32.s: $(BUILD)
$(BUILD) @BUILDFLAGS@ -o $@ -call32
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/winmm/mciseq/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
mciseq.spec.c
libmciseq.drv.so.1.0
dlls/winmm/mciseq/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = mciseq.drv
SOVERSION = 1.0
SPEC_SRCS = \
mciseq.spec
......@@ -11,11 +13,11 @@ SPEC_SRCS = \
C_SRCS = \
mcimidi.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
call32.s: $(BUILD)
$(BUILD) @BUILDFLAGS@ -o $@ -call32
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/winmm/mciwave/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
mciwave.spec.c
libmciwave.drv.so.1.0
dlls/winmm/mciwave/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = mciwave.drv
SOVERSION = 1.0
SPEC_SRCS = \
mciwave.spec
......@@ -11,11 +13,11 @@ SPEC_SRCS = \
C_SRCS = \
mciwave.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
call32.s: $(BUILD)
$(BUILD) @BUILDFLAGS@ -o $@ -call32
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/winmm/midimap/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
midimap.spec.c
libmidimap.drv.so.1.0
dlls/winmm/midimap/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = midimap.drv
SOVERSION = 1.0
SPEC_SRCS = \
midimap.spec
......@@ -11,11 +13,11 @@ SPEC_SRCS = \
C_SRCS = \
midimap.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
call32.s: $(BUILD)
$(BUILD) @BUILDFLAGS@ -o $@ -call32
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/winmm/wavemap/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
msacm.spec.c
libmsacm.drv.so.1.0
dlls/winmm/wavemap/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = msacm.drv
SOVERSION = 1.0
SPEC_SRCS = \
msacm.spec
......@@ -11,11 +13,11 @@ SPEC_SRCS = \
C_SRCS = \
wavemap.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
call32.s: $(BUILD)
$(BUILD) @BUILDFLAGS@ -o $@ -call32
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/winmm/wineoss/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
wineoss.spec.c
libwineoss.drv.so.1.0
dlls/winmm/wineoss/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = wineoss.drv
SOVERSION = 1.0
SPEC_SRCS = \
wineoss.spec
......@@ -16,11 +18,11 @@ C_SRCS = \
mmaux.c \
oss.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
call32.s: $(BUILD)
$(BUILD) @BUILDFLAGS@ -o $@ -call32
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/winsock/.cvsignore
View file @ 318f4cef
Makefile
*.spec.c
*.spec.glue.s
Makefile
libwsock32.so.1.0
dlls/winsock/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = winsock
LIBEXT = @LIBEXT@
MODULE = wsock32
SOVERSION = 1.0
SPEC_SRCS = winsock.spec wsock32.spec
......@@ -11,8 +13,11 @@ C_SRCS = \
async.c \
socket.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/winspool/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
winspool.spec.c
libwinspool.so.1.0
dlls/winspool/Makefile.in
View file @ 318f4cef
......@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = winspool
SOVERSION = 1.0
SPEC_SRCS = winspool.spec
......@@ -11,9 +13,12 @@ C_SRCS = \
info.c \
wspool.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
dlls/wnaspi32/.cvsignore
View file @ 318f4cef
*.spec.c
Makefile
wnaspi32.spec.c
libwnaspi32.so.1.0
dlls/wnaspi32/Makefile.in
View file @ 318f4cef
......@@ -3,15 +3,20 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = wnaspi32
SOVERSION = 1.0
SPEC_SRCS = wnaspi32.spec
C_SRCS = \
winaspi32.c
all: $(MODULE).o
all: lib$(MODULE).$(LIBEXT)
@MAKE_RULES@
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies:
include/Makefile.in
View file @ 318f4cef
......@@ -4,8 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = none
LIB_TARGET = @LIB_TARGET@
INSTALLED_INCLUDES = \
windef.h \
windows.h \
......@@ -14,15 +12,9 @@ INSTALLED_INCLUDES = \
@MAKE_RULES@
# Testing LIB_TARGET prevents installing header files
# when --disable-lib is used
install:: dummy
if [ $(LIB_TARGET) ]; then \
[ -d $(includedir) ] || $(MKDIR) $(includedir); \
for f in $(INSTALLED_INCLUDES); do \
$(INSTALL_DATA) $(SRCDIR)/$$f $(includedir); \
done; \
fi
install::
[ -d $(includedir) ] || $(MKDIR) $(includedir)
for f in $(INSTALLED_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir); done
# Don't just do a rm -rf on $(includedir) -- don't want to wipe out
# anything extra the user may have put there.
......@@ -30,6 +22,4 @@ uninstall::
cd $(includedir); $(RM) $(INSTALLED_INCLUDES)
-rmdir $(includedir)
dummy:
### Dependencies:
library/checklink.c 0 → 100644
View file @ 318f4cef
int main(void)
{
return 0;
}
loader/loadorder.c
View file @ 318f4cef
......@@ -381,7 +381,7 @@ BOOL MODULE_InitLoadOrder(void)
#endif
/* Get the default load order */
nbuffer = PROFILE_GetWineIniString("DllDefaults", "DefaultLoadOrder", "n,e,s,b", buffer, sizeof(buffer));
nbuffer = PROFILE_GetWineIniString("DllDefaults", "DefaultLoadOrder", "n,b,e,s", buffer, sizeof(buffer));
if(!nbuffer)
{
MESSAGE("MODULE_InitLoadOrder: mysteriously read nothing from default loadorder\n");
......
programs/avitools/Makefile.in
View file @ 318f4cef
......@@ -21,8 +21,6 @@ MOSTOBJS = $(MOSTSRCS:.c=.o)
all: check_wrc $(PROGRAMS)
depend::
@MAKE_RULES@
# Override resource compiler rules
......@@ -34,14 +32,12 @@ aviinfo: aviinfo.o $(WINESTUB)
aviplay: aviplay.o $(WINESTUB)
$(CC) -o aviplay aviplay.o $(LDOPTIONS) $(ALL_LIBS)
install: dummy
install::
$(INSTALL_PROGRAM) icinfo $(bindir)/icinfo
$(INSTALL_PROGRAM) aviinfo $(bindir)/aviinfo
$(INSTALL_PROGRAM) aviplay $(bindir)/aviplay
uninstall: dummy
uninstall::
$(RM) $(bindir)/aviinfo $(bindir)/icinfo $(bindir)/aviplay
dummy:
### Dependencies:
programs/clock/Makefile.in
View file @ 318f4cef
......@@ -21,8 +21,6 @@ RC_SRCS = rsrc.rc
all: check_wrc $(PROGRAMS)
depend::
@MAKE_RULES@
# Override resource compiler rules
......@@ -33,10 +31,10 @@ depend::
clock: $(OBJS) $(WINESTUB)
$(CC) -o clock $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
install:: dummy
install::
$(INSTALL_PROGRAM) clock $(bindir)/clock
uninstall:: dummy
uninstall::
$(RM) $(bindir)/clock
### Dependencies:
programs/cmdlgtst/Makefile.in
View file @ 318f4cef
......@@ -32,14 +32,12 @@ depend:: $(RC_SRCS:.rc=.h)
cmdlgtst: $(OBJS) $(WINESTUB)
$(CC) -o cmdlgtst $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
install: dummy
install::
$(INSTALL_PROGRAM) cmdlgtst $(bindir)/cmdlgtst
uninstall: dummy
uninstall::
$(RM) $(bindir)/cmdlgtst
$(RC_SRCS:.rc=.s): $(WRC)
dummy:
### Dependencies:
programs/control/Makefile.in
View file @ 318f4cef
......@@ -16,12 +16,10 @@ all: $(PROGRAMS)
control: $(OBJS) $(WINESTUB)
$(CC) -o control $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
install: dummy
install::
$(INSTALL_PROGRAM) control $(bindir)/control
uninstall: dummy
uninstall::
$(RM) $(bindir)/control
dummy:
### Dependencies:
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