From 634ffca8d2a051d94d4b2590ad7124544d48f005 Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Sun, 10 Jun 2001 02:43:39 +0000
Subject: Fix debug build stages.

CVS patchset: 151
CVS date: 2001/06/10 02:43:39
---
 src/libw32dll/Makefile.am      |  9 ++++++---
 src/libw32dll/wine/Makefile.am | 30 ++++++++++++++++++------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index c54839ca5..338040d93 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -6,7 +6,7 @@ if HAVE_W32DLL
 w32dll_codec = xineplug_decode_w32dll.la
 endif
 
-# LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
+LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 libdir = $(XINE_PLUGINDIR)
 
@@ -19,12 +19,15 @@ lib_LTLIBRARIES = $(w32dll_codec)
 
 xineplug_decode_w32dll_la_SOURCES = w32codec.c
 xineplug_decode_w32dll_la_LDFLAGS = -avoid-version -module
-xineplug_decode_w32dll_la_LIBADD = wine/libwine.la
+xineplug_decode_w32dll_la_LIBADD = $(top_builddir)/src/libw32dll/wine/libwine.la
 
 noinst_HEADERS = w32codec.h
 
 debug:
-	$(MAKE) CFLAGS="$(CFLAGS) -g -DSTATIC_WIN32_PATH"
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  (cd $$subdir && $(MAKE) $@) \
+	done;
+	$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
 
 install-debug: debug
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am
index 21835ddf2..7fb454cdd 100644
--- a/src/libw32dll/wine/Makefile.am
+++ b/src/libw32dll/wine/Makefile.am
@@ -1,34 +1,40 @@
 EXTRA_DIST = stubs.s
 
+noinst_LTLIBRARIES = $(wine_lib)
+
+##
+## this wine lib seems to be very sensitive with cflags, so we override
+## all of them.
+##
 CFLAGS = @BUILD_LIB_STATIC@ -fno-omit-frame-pointer @X_CFLAGS@ \
-	 -DWIN32_PATH=\"@w32_path@\" -pipe
+	-DWIN32_PATH=\"@w32_path@\" -pipe
 
-
-noinst_HEADERS = avifmt.h      elfdll.h    msacm.h     pshpack1.h   winbase.h \
-                 winnt.h       basetsd.h   heap.h      msacmdrv.h   pshpack2.h\
-                 windef.h      winreg.h    config.h    ldt.h        ntdef.h   \
-                 pshpack4.h    windows.h   winuser.h   debugtools.h mmreg.h   \
-                 pe_image.h    pshpack8.h  winerror.h  driver.h     module.h  \
-                 poppack.h     vfw.h       winestring.h \
-		 loader.h  registry.h  win32.h  wineacm.h 
+DEBUG_CFLAGS = @BUILD_LIB_STATIC@ -fno-omit-frame-pointer @X_CFLAGS@ \
+		-pipe -g -DSTATIC_WIN32_PATH
 
 
 if HAVE_W32DLL
 wine_lib = libwine.la
 endif
 
-noinst_LTLIBRARIES = $(wine_lib)
-
 libwine_la_SOURCES = afl.c       elfdll.c    module.c    pe_resource.c  \
 		     resource.c  win32.c     driver.c    ext.c          \
 		     pe_image.c  registry.c  vfl.c        
-
 libwine_la_LIBADD = stubs.lo
 
+noinst_HEADERS = avifmt.h      elfdll.h    msacm.h     pshpack1.h   winbase.h \
+		 winnt.h       basetsd.h   heap.h      msacmdrv.h   pshpack2.h\
+		 windef.h      winreg.h    config.h    ldt.h        ntdef.h   \
+		 pshpack4.h    windows.h   winuser.h   debugtools.h mmreg.h   \
+		 pe_image.h    pshpack8.h  winerror.h  driver.h     module.h  \
+		 poppack.h     vfw.h       loader.h    registry.h   win32.h   \
+		 wineacm.h     winestring.h
+
 stubs.lo: stubs.s
 	$(CC) -c $(top_srcdir)/src/libw32dll/wine/stubs.s -o stubs.lo
 
 debug:
+	$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
 
 mostlyclean-generic:
 	-rm -f *~ \#* .*~ .\#*
-- 
cgit v1.2.3