build system fixes by Michał Górny.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@88128 e17a0e51-4ae3-4d35-97c3-1a29b211df97

6 files changed, 10 insertions, 9 deletions

diff --git a/plugins/bladesio1/Makefile.am b/plugins/bladesio1/Makefile.am
index 5b7fee43..9e0b6ab5 100644
--- a/plugins/bladesio1/Makefile.am
+++ b/plugins/bladesio1/Makefile.am
@@ -3,13 +3,13 @@ libdir = @libdir@/games/psemu/
 
 lib_LTLIBRARIES = libBladeSio1.la
 
-libBladeSio1_la_SOURCES = cfg.c sio1.c sio1.h fifo.c fifo.h connection.c connection.h
+libBladeSio1_la_SOURCES = cfg.c sio1.c sio1.h fifo.c fifo.h connection.c connection.h typedefs.h
 libBladeSio1_la_LDFLAGS = -module -avoid-version
 
 AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
 	$(GTK3_CFLAGS) \
-	-I../../libpcsxcore -I../../include
+	-I$(top_srcdir)/libpcsxcore -I../../include
 
 bin_PROGRAMS = cfgBladeSio1
 cfgBladeSio1_SOURCES = gui.c sio1.h
diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am
index b4c729f9..6bc42c35 100644
--- a/plugins/dfcdrom/Makefile.am
+++ b/plugins/dfcdrom/Makefile.am
@@ -24,7 +24,7 @@ endif
 AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
 	$(GTK3_CFLAGS) \
-	-I../../libpcsxcore -I../../include
+	-I$(top_srcdir)/libpcsxcore -I../../include
 
 bin_PROGRAMS = cfgDFCdrom
 cfgDFCdrom_SOURCES = cdrcfg-0.1df/main.c
diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am
index f270ca73..70f86fd1 100644
--- a/plugins/dfinput/Makefile.am
+++ b/plugins/dfinput/Makefile.am
@@ -10,7 +10,7 @@ libDFInput_la_LIBADD = -lpthread -lX11 $(SDL2_LIBS) $(SDL_LIBS)
 AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
 	$(GTK3_CFLAGS) \
-	-I../../include -I../../libpcsxcore $(SDL2_CFLAGS) $(SDL_CFLAGS)
+	-I../../include -I$(top_srcdir)/libpcsxcore $(SDL2_CFLAGS) $(SDL_CFLAGS)
 
 bin_PROGRAMS = cfgDFInput
 cfgDFInput_SOURCES = cfg-gtk.c pad.h
diff --git a/plugins/dfnet/Makefile.am b/plugins/dfnet/Makefile.am
index 004df634..d639c652 100755
--- a/plugins/dfnet/Makefile.am
+++ b/plugins/dfnet/Makefile.am
@@ -9,7 +9,7 @@ libDFNet_la_LDFLAGS = -module -avoid-version
 AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
 	$(GTK3_CFLAGS) \
-	-I../../libpcsxcore -I../../include
+	-I$(top_srcdir)/libpcsxcore -I../../include
 
 bin_PROGRAMS = cfgDFNet
 cfgDFNet_SOURCES = gui.c
diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am
index 2af76fde..3036da5f 100755
--- a/plugins/dfxvideo/Makefile.am
+++ b/plugins/dfxvideo/Makefile.am
@@ -9,7 +9,7 @@ SUFFIXES = .asm
 AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
 	$(GTK3_CFLAGS)\
-	-I../../libpcsxcore \
+	-I$(top_srcdir)/libpcsxcore \
 	-I../../include
 
 bindir = @libdir@/games/psemu/
diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am
index 99c9554c..3c8f7250 100755
--- a/plugins/peopsxgl/Makefile.am
+++ b/plugins/peopsxgl/Makefile.am
@@ -2,15 +2,16 @@ AM_CPPFLAGS = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
 	-DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
 	$(GTK3_CFLAGS) \
-	-I../../libpcsxcore -I../../include
+	-I$(top_srcdir)/libpcsxcore -I../../include
 
 bindir = @libdir@/games/psemu/
 libdir = @libdir@/games/psemu/
 
 lib_LTLIBRARIES = libpeopsxgl.la
 
-libpeopsxgl_la_SOURCES = cfg.c draw.c fps.c gpu.c key.c menu.c \
-	prim.c soft.c texture.c gte_accuracy.c
+libpeopsxgl_la_SOURCES = cfg.c cfg.h draw.c draw.h fps.c fps.h gl_ext.h \
+	gpu.c gpu.h key.c key.h menu.c menu.h prim.c prim.h soft.c soft.h \
+	texture.c texture.h gte_accuracy.c gte_accuracy.h
 libpeopsxgl_la_LDFLAGS = -module -avoid-version
 libpeopsxgl_la_LIBADD = -lX11 -lXxf86vm -lGL -lm