diff options
| author | Juergen Keil <jkeil@users.sourceforge.net> | 2002-01-07 12:19:46 +0000 |
|---|---|---|
| committer | Juergen Keil <jkeil@users.sourceforge.net> | 2002-01-07 12:19:46 +0000 |
| commit | d9db751ede22e114d41c0b6fb095e2ce68c0514a (patch) | |
| tree | 450d3357305fea97e96a2e076e9bc21f2eb634b3 /src | |
| parent | ea7419981d1beef0d9e78cd0169d502184bdd1fc (diff) | |
| download | xine-lib-d9db751ede22e114d41c0b6fb095e2ce68c0514a.tar.gz xine-lib-d9db751ede22e114d41c0b6fb095e2ce68c0514a.tar.bz2 | |
Compilation in separate obj-dir broken
CVS patchset: 1362
CVS date: 2002/01/07 12:19:46
Diffstat (limited to 'src')
| -rw-r--r-- | src/libw32dll/DirectShow/Makefile.am | 4 | ||||
| -rw-r--r-- | src/libw32dll/Makefile.am | 6 | ||||
| -rw-r--r-- | src/libw32dll/wine/Makefile.am | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/libw32dll/DirectShow/Makefile.am b/src/libw32dll/DirectShow/Makefile.am index a9636a6b0..8e29c5894 100644 --- a/src/libw32dll/DirectShow/Makefile.am +++ b/src/libw32dll/DirectShow/Makefile.am @@ -2,12 +2,12 @@ CFLAGS = @GLOBAL_CFLAGS@ @X_CFLAGS@ -fno-omit-frame-pointer \ -Wmissing-prototypes -Wimplicit-function-declaration \ -DWIN32_PATH=\"@w32_path@\" -DNOAVIFILE_HEADERS \ - -I.. -I../wine + -I$(srcdir)/.. -I$(srcdir)/../wine DEBUG_CFLAGS = @DEBUG_CFLAGS@ @X_CFLAGS@ -fno-omit-frame-pointer \ -Wmissing-prototypes -Wimplicit-function-declaration \ -DWIN32_PATH=\\\"@w32_path@\\\" -DNOAVIFILE_HEADERS \ - -I.. -I../wine + -I$(srcdir)/.. -I$(srcdir)/../wine if HAVE_W32DLL ds_filter_lib = libds_filter.la diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am index 78512268f..71c705804 100644 --- a/src/libw32dll/Makefile.am +++ b/src/libw32dll/Makefile.am @@ -1,4 +1,6 @@ -CFLAGS = @GLOBAL_CFLAGS@ -Iwine +CFLAGS = @GLOBAL_CFLAGS@ -I$(srcdir)/wine + +DEBUG_CFLAGS = @DEBUG_CFLAGS@ -I$(srcdir)/wine SUBDIRS = wine DirectShow @@ -28,7 +30,7 @@ debug: @list='$(SUBDIRS)'; for subdir in $$list; do \ (cd $$subdir && $(MAKE) $@) || exit;\ done; - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) -Iwine" + @$(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 3c9f9999f..21e803d41 100644 --- a/src/libw32dll/wine/Makefile.am +++ b/src/libw32dll/wine/Makefile.am @@ -6,12 +6,12 @@ noinst_LTLIBRARIES = $(wine_lib) ## CFLAGS = @GLOBAL_CFLAGS@ @X_CFLAGS@ -fno-omit-frame-pointer \ -Wmissing-prototypes -Wimplicit-function-declaration \ - -DWIN32_PATH=\"@w32_path@\" -I.. -D__WINE__ \ + -DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \ -Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer DEBUG_CFLAGS = @DEBUG_CFLAGS@ @X_CFLAGS@ -fno-omit-frame-pointer \ -Wmissing-prototypes -Wimplicit-function-declaration \ - -DWIN32_PATH=\\\"@w32_path@\\\" -I.. -D__WINE__ \ + -DWIN32_PATH=\\\"@w32_path@\\\" -I$(srcdir)/.. -D__WINE__ \ -Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer @@ -33,7 +33,7 @@ noinst_HEADERS = avifmt.h elfdll.h msacm.h pshpack1.h winbase.h \ wineacm.h winestring.h resource.h ldt_keeper.h com.h stubs.lo: stubs.s - $(CC) -c $(top_srcdir)/src/libw32dll/wine/stubs.s -o stubs.lo + $(CC) -c $(srcdir)/stubs.s -o stubs.lo debug: @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" |