build system fixes by Michał Górny.

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

10 files changed, 85 insertions, 81 deletions

diff --git a/Makefile.am b/Makefile.am
index 31b092db..1873a6bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,4 +13,6 @@ SUBDIRS += plugins/dfnet
 SUBDIRS += $(BLADESIO1)
 SUBDIRS += $(PEOPSXGL)
 
+DIST_SUBDIRS = $(SUBDIRS) plugins/bladesio1 plugins/peopsxgl
+
 EXTRA_DIST = AUTHORS COPYING INSTALL NEWS README ChangeLog ChangeLog.df strip_fPIC.sh
diff --git a/configure.ac b/configure.ac
index 1b1cb732..b82248a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,11 +43,13 @@ data/Makefile
 doc/Makefile
 libpcsxcore/Makefile
 gui/Makefile
+plugins/bladesio1/Makefile
 plugins/dfinput/Makefile
 plugins/dfsound/Makefile
 plugins/dfxvideo/Makefile
 plugins/dfcdrom/Makefile
 plugins/dfnet/Makefile
+plugins/peopsxgl/Makefile
 pixmaps/Makefile
 po/Makefile.in])
 
@@ -144,7 +146,6 @@ if test "$BUILD_OPENGL" = "yes"; then
 	fi
 	PEOPSXGL="plugins/peopsxgl"
 	AC_SUBST(PEOPSXGL)
-	AC_CONFIG_FILES([plugins/peopsxgl/Makefile])
 fi
 
 AC_ARG_ENABLE(sio1, [  --enable-sio1         build SIO1 plugin (default=yes)],
@@ -156,7 +157,6 @@ if test "$BUILD_SIO1" = "yes"; then
 	AC_DEFINE([ENABLE_SIO1API], [1], [Define if we want use sio interface.])
 	BLADESIO1="plugins/bladesio1"
 	AC_SUBST(BLADESIO1)
-	AC_CONFIG_FILES([plugins/bladesio1/Makefile])
 fi
 
 #####apt-get install libavcodec-dev libavformat-dev libavutil-dev
diff --git a/data/pcsxr.desktop b/data/pcsxr.desktop
index 2e6a9a7c..c284f003 100644
--- a/data/pcsxr.desktop
+++ b/data/pcsxr.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Type=Application
 Name=PCSXR
 GenericName=PlayStation Emulator
diff --git a/libpcsxcore/Makefile.am b/libpcsxcore/Makefile.am
index 1ae5389e..b67700e4 100644
--- a/libpcsxcore/Makefile.am
+++ b/libpcsxcore/Makefile.am
@@ -4,85 +4,87 @@ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 noinst_LIBRARIES = libpcsxcore.a
 
 libpcsxcore_a_SOURCES = \
-	$(top_builddir)/libpcsxcore/psxbios.c	\
-	$(top_builddir)/libpcsxcore/cdrom.c	\
-	$(top_builddir)/libpcsxcore/psxcounters.c	\
-	$(top_builddir)/libpcsxcore/psxdma.c	\
-	$(top_builddir)/libpcsxcore/disr3000a.c	\
-	$(top_builddir)/libpcsxcore/gpu.c	\
-	$(top_builddir)/libpcsxcore/gpu.h	\
-	$(top_builddir)/libpcsxcore/spu.c	\
-	$(top_builddir)/libpcsxcore/sio.c	\
-	$(top_builddir)/libpcsxcore/psxhw.c	\
-	$(top_builddir)/libpcsxcore/mdec.c	\
-	$(top_builddir)/libpcsxcore/psxmem.c	\
-	$(top_builddir)/libpcsxcore/misc.c	\
-	$(top_builddir)/libpcsxcore/plugins.c	\
-	$(top_builddir)/libpcsxcore/decode_xa.c	\
-	$(top_builddir)/libpcsxcore/r3000a.c	\
-	$(top_builddir)/libpcsxcore/psxinterpreter.c	\
-	$(top_builddir)/libpcsxcore/gte.c	\
-	$(top_builddir)/libpcsxcore/psxhle.c	\
-	$(top_builddir)/libpcsxcore/cdrom.h \
-	$(top_builddir)/libpcsxcore/coff.h \
-	$(top_builddir)/libpcsxcore/debug.c \
-	$(top_builddir)/libpcsxcore/debug.h \
-	$(top_builddir)/libpcsxcore/decode_xa.h \
-	$(top_builddir)/libpcsxcore/gte.h \
-	$(top_builddir)/libpcsxcore/gte_divider.h \
-	$(top_builddir)/libpcsxcore/mdec.h \
-	$(top_builddir)/libpcsxcore/misc.h \
-	$(top_builddir)/libpcsxcore/plugins.h \
-	$(top_builddir)/libpcsxcore/psemu_plugin_defs.h \
-	$(top_builddir)/libpcsxcore/psxbios.h \
-	$(top_builddir)/libpcsxcore/psxcommon.c \
-	$(top_builddir)/libpcsxcore/psxcommon.h \
-	$(top_builddir)/libpcsxcore/psxcounters.h \
-	$(top_builddir)/libpcsxcore/psxdma.h \
-	$(top_builddir)/libpcsxcore/psxhle.h \
-	$(top_builddir)/libpcsxcore/psxhw.h \
-	$(top_builddir)/libpcsxcore/psxmem.h \
-	$(top_builddir)/libpcsxcore/r3000a.h \
-	$(top_builddir)/libpcsxcore/sio.h \
-	$(top_builddir)/libpcsxcore/sjisfont.h \
-	$(top_builddir)/libpcsxcore/spu.h \
-	$(top_builddir)/libpcsxcore/system.h \
-	$(top_builddir)/libpcsxcore/cdriso.c \
-	$(top_builddir)/libpcsxcore/cdriso.h \
-	$(top_builddir)/libpcsxcore/cheat.c \
-	$(top_builddir)/libpcsxcore/cheat.h \
-	$(top_builddir)/libpcsxcore/socket.c \
-	$(top_builddir)/libpcsxcore/socket.h \
-	$(top_builddir)/libpcsxcore/ppf.c \
-	$(top_builddir)/libpcsxcore/ppf.h
+	psxbios.c	\
+	cdrom.c	\
+	psxcounters.c	\
+	psxdma.c	\
+	disr3000a.c	\
+	gpu.c	\
+	gpu.h	\
+	spu.c	\
+	sio.c	\
+	psxhw.c	\
+	mdec.c	\
+	psxmem.c	\
+	misc.c	\
+	plugins.c	\
+	decode_xa.c	\
+	r3000a.c	\
+	psxinterpreter.c	\
+	gte.c	\
+	psxhle.c	\
+	cdrom.h \
+	coff.h \
+	debug.c \
+	debug.h \
+	decode_xa.h \
+	ecm.h \
+	gte.h \
+	mdec.h \
+	misc.h \
+	plugins.h \
+	psemu_plugin_defs.h \
+	psxbios.h \
+	psxcommon.c \
+	psxcommon.h \
+	psxcounters.h \
+	psxdma.h \
+	psxhle.h \
+	psxhw.h \
+	psxmem.h \
+	r3000a.h \
+	sio.h \
+	sjisfont.h \
+	spu.h \
+	system.h \
+	cdriso.c \
+	cdriso.h \
+	cheat.c \
+	cheat.h \
+	socket.c \
+	socket.h \
+	ppf.c \
+	ppf.h
 
 if ARCH_X86_64
 libpcsxcore_a_SOURCES += \
-	$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c	\
-	$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c	\
-	$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c	\
-	$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c	\
-	$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c	\
-	$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c	\
-	$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c	\
-	$(top_builddir)/libpcsxcore/
+	ix86_64/iGte.h		\
+	ix86_64/iR3000A-64.c	\
+	ix86_64/ix86-64.c	\
+	ix86_64/ix86-64.h	\
+	ix86_64/ix86_cpudetect.c	\
+	ix86_64/ix86_fpu.c	\
+	ix86_64/ix86_3dnow.c	\
+	ix86_64/ix86_mmx.c	\
+	ix86_64/ix86_sse.c
 else		
 if ARCH_X86
 libpcsxcore_a_SOURCES += \
-	$(top_builddir)/libpcsxcore/ix86/iGte.h	\
-	$(top_builddir)/libpcsxcore/ix86/iR3000A.c	\
-	$(top_builddir)/libpcsxcore/ix86/ix86.c	\
-	$(top_builddir)/libpcsxcore/ix86/ix86.h	\
-	$(top_builddir)/libpcsxcore/
+	ix86/iGte.h	\
+	ix86/iR3000A.c	\
+	ix86/ix86.c	\
+	ix86/ix86.h
 endif
 endif
 
 if ARCH_PPC
 libpcsxcore_a_SOURCES += \
-	$(top_builddir)/libpcsxcore/ppc/pR3000A.c	\
-	$(top_builddir)/libpcsxcore/ppc/ppc.c	\
-	$(top_builddir)/libpcsxcore/ppc/reguse.c	\
-	$(top_builddir)/libpcsxcore/ppc/pasm.s	\
-	$(top_builddir)/libpcsxcore/
+	ppc/pGte.h	\
+	ppc/pR3000A.c	\
+	ppc/ppc.c	\
+	ppc/ppc.h	\
+	ppc/ppc_mnemonics.h	\
+	ppc/reguse.c	\
+	ppc/reguse.h
 libpcsxcore_a_CCASFLAGS = -x assembler-with-cpp -mregnames -D__POWERPC__
 endif
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