gitmodules: Move to subprojects/

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "libgwater"]
-	path = libgwater
+	path = subprojects/libgwater
 	url = git://github.com/sardemff7/libgwater

Makefile.am

@@ -1,7 +1,7 @@
 # Specify automake version.
 AUTOMAKE_OPTIONS  = 1.11.3
 
-ACLOCAL_AMFLAGS = -I libgwater ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I subprojects/libgwater ${ACLOCAL_FLAGS}
 
 AM_YFLAGS = -d
 

libgwater-xcb-nolibtool.mk

@@ -1,20 +1,20 @@
 noinst_LIBRARIES += \
-	libgwater/libgwater-xcb.a
+	libgwater-xcb.a
 
-libgwater_libgwater_xcb_a_SOURCES = \
-	libgwater/xcb/libgwater-xcb.c \
-	libgwater/xcb/libgwater-xcb.h
+libgwater_xcb_a_SOURCES = \
+	subprojects/libgwater/xcb/libgwater-xcb.c \
+	subprojects/libgwater/xcb/libgwater-xcb.h
 
-libgwater_libgwater_xcb_a_CFLAGS = \
+libgwater_xcb_a_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(GW_XCB_INTERNAL_CFLAGS)
 
 
 GW_XCB_CFLAGS = \
-	-I$(srcdir)/libgwater/xcb \
+	-I$(srcdir)/subprojects/libgwater/xcb \
 	$(GW_XCB_INTERNAL_CFLAGS)
 
 GW_XCB_LIBS = \
-	libgwater/libgwater-xcb.a \
+	libgwater-xcb.a \
 	$(GW_XCB_INTERNAL_LIBS)