More distcheck fixes

browser/sessionstore/Makefile.am

@@ -4,8 +4,6 @@ sessionstore_DATA =		\
 	nsISessionStore.xpt	\
 	nsSessionStore.js
 
-EXTRA_DIST = $(sessionstore_DATA)
-
 BUILT_SOURCES = \
 	nsISessionStore.xpt	\
 	nsISessionStore.h
@@ -18,17 +16,17 @@ nsISessionStore.xpt: stamp-nsISessionStore.xpt
 	@true
 stamp-nsISessionStore.xpt: nsISessionStore.idl
 	$(XPIDL) -m typelib -w -v -I $(MOZILLA_IDL_DIR) -e nsISessionStore.xpt \
-	nsISessionStore.idl \
+	$(srcdir)/nsISessionStore.idl \
 	&& echo timestamp > $(@F)
 
 nsISessionStore.h: stamp-nsISessionStore.h
 	@true
 stamp-nsISessionStore.h: nsISessionStore.idl
 	$(XPIDL) -m header -w -v -I $(MOZILLA_IDL_DIR) -e nsISessionStore.h \
-	nsISessionStore.idl \
+	$(srcdir)/nsISessionStore.idl \
 	&& echo timestamp > $(@F)
 
 CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
-EXTRA_DIST = nsISessionStore.idl
+EXTRA_DIST = nsISessionStore.idl nsSessionStore.js

shell/extensions/Makefile.am

@@ -8,11 +8,12 @@ pkgpyexec_LTLIBRARIES = _extensions.la
 
 _extensions_la_LDFLAGS = -module -avoid-version
 
-_extensions_la_CFLAGS =		\
-	$(WARN_CFLAGS)		\
-	$(PYTHON_INCLUDES)	\
-	$(PYGTK_CFLAGS)		\
-	$(SHELL_CFLAGS)
+_extensions_la_CFLAGS =				\
+	$(WARN_CFLAGS)				\
+	$(PYTHON_INCLUDES)			\
+	$(PYGTK_CFLAGS)				\
+	$(SHELL_CFLAGS)				\
+	-I$(top_srcdir)/shell/extensions
 
 _extensions_la_LIBADD = 	\
 	$(SHELL_LIBS) 		\