Make dist now works

Original commit message from CVS:
Make dist now works

diff --git a/include/Makefile.am b/include/Makefile.am
index 0039492..6414a20 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,8 +1,5 @@
 SUBDIRS = wine
 
 noinst_HEADERS = \
-       avifmt.h \
-       default.h \
        mmx.h \
-       registry.h \
        sse.h

diff --git a/libs/winloader/Makefile.am b/libs/winloader/Makefile.am
index 3736211..ececec2 100644 (file)
--- a/libs/winloader/Makefile.am
+++ b/libs/winloader/Makefile.am
@@ -8,7 +8,7 @@ CFLAGS += -O0 -funroll-loops
 libwinloader_la_SOURCES = win32.c driver.c elfdll.c ext.c module.c \
 pe_image.c pe_resource.c registry.c resource.c stubs.s vfl.c afl.c
 
-noinst_HEADERS = wineacm.h
+noinst_HEADERS = wineacm.h win32.h registry.h avifmt.h
 
 DEFINES=-rdynamic -fPIC -D__WINE__ -Ddbg_printf=__vprintf -DTRACE=__vprintf 
 CFLAGS += $(DEFINES)

diff --git a/libs/winloader/driver.c b/libs/winloader/driver.c
index a753aa5..3dfd0ff 100644 (file)
--- a/libs/winloader/driver.c
+++ b/libs/winloader/driver.c
@@ -6,6 +6,8 @@
 #include <wine/vfw.h>
 #include <registry.h>
 
+#include "config.h"
+
 #define STORE_ALL \
     __asm__ ( \
     "push %%ebx\n\t" \
@@ -23,7 +25,7 @@
     "pop %%ebx\n\t"::)
 
 
-#define WIN32_PATH "/usr/lib/win32"
+#define WIN32_PATH GST_WIN32_LIBDIR
 
 typedef struct {
     UINT             uDriverSignature;