* ALL: fixed a few include directories.

diff --git a/Makefile.modules b/Makefile.modules
index 678747b8f0a60a978e0520f7644a2aa5cc4a53f7..2a54e0037bf6a5234072ed47e1f0c10984ada746 100644 (file)
--- a/Makefile.modules
+++ b/Makefile.modules
@@ -23,8 +23,8 @@ SRC_C := $(filter %.c,$($(module_name)_SOURCES))
 SRC_CPP := $(filter %.cpp,$($(module_name)_SOURCES))
 SRC_M := $(filter %.m,$($(module_name)_SOURCES))
 
-plugins_CFLAGS += -D__PLUGIN__ -I$(PARENT)/include -I$(PARENT)/extras
-builtins_CFLAGS += -D__BUILTIN__ -I$(PARENT)/include -I$(PARENT)/extras
+plugins_CFLAGS += -D__PLUGIN__ -I$(PARENT) -I$(PARENT)/include -I$(PARENT)/extras
+builtins_CFLAGS += -D__BUILTIN__ -I$(PARENT) -I$(PARENT)/include -I$(PARENT)/extras
 
 ifeq (lo,$(suff))
 extra_CFLAGS := $(plugins_CFLAGS) $($(module_name)_CFLAGS) \

diff --git a/Makefile.opts.in b/Makefile.opts.in
index 5e690a8af3066eabe648d9b1eda3df4c4f0848db..2b8552e729acaab07455ebc27adfb5f6e027aea2 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -199,7 +199,7 @@ CFLAGS += -DPLUGIN_PATH=\"@prefix@/lib/vlc\"
 #
 # C headers directories
 #
-CFLAGS += -Iinclude -Iextras
+vlc_CFLAGS += -Iinclude -Iextras -I.
 
 #
 # C compiler flags: mainstream compilation

diff --git a/include/vlc/vlc.h b/include/vlc/vlc.h
index 01ecf79e7ec49e9698b2709b6024fd6ea16558c9..0959bce62c27872dd6383154fc2595bb9a8ea123 100644 (file)
--- a/include/vlc/vlc.h
+++ b/include/vlc/vlc.h
@@ -2,7 +2,7 @@
  * vlc.h: global header for vlc
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc.h,v 1.11 2002/08/26 01:01:13 sam Exp $
+ * $Id: vlc.h,v 1.12 2002/08/26 08:36:12 sam Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -95,7 +95,7 @@ typedef int        vlc_status_t;
  * Required internal headers
  *****************************************************************************/
 #if defined( __VLC__ )
-#   include "../config.h"
+#   include "config.h"
 #   include "vlc_config.h"
 #   include "modules_inner.h"
 #   include "vlc_common.h"

diff --git a/mozilla/Makefile b/mozilla/Makefile
index 019e9e4272b05fa3c3cfba3382ff3a464fd159e1..21ea405df605d84b13eea1d3c99bde3b08a3a0f2 100644 (file)
--- a/mozilla/Makefile
+++ b/mozilla/Makefile
@@ -37,7 +37,7 @@ $(PLUGIN_OBJ): Makefile ../lib/libvlc.a $(BUILTIN_OBJ:%=../%) $(C_OBJ)
        $(CC) -shared $(LDFLAGS) -L../lib $(mozilla_LDFLAGS) $(C_OBJ) -lvlc $(BUILTIN_OBJ:%=../%) $(builtins_LDFLAGS) -o $@
 
 $(C_OBJ): %.o: %.c vlcplugin.h
-       $(CC) $(CFLAGS) -I../include $(mozilla_CFLAGS) -c $< -o $@
+       $(CC) $(CFLAGS) -I.. -I../include $(mozilla_CFLAGS) -c $< -o $@
 
 ../%:
        @cd .. && $(MAKE) $(@:../%=%)