diff options
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | libgwater-xcb-nolibtool.mk | 14 | ||||
| m--------- | subprojects/libgwater (renamed from libgwater) | 0 |
4 files changed, 9 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index 2034529a..b0c4f823 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "libgwater"] - path = libgwater + path = subprojects/libgwater url = git://github.com/sardemff7/libgwater diff --git a/Makefile.am b/Makefile.am index c48a8915..5a112cef 100644 --- a/Makefile.am +++ b/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 diff --git a/libgwater-xcb-nolibtool.mk b/libgwater-xcb-nolibtool.mk index e4e07eb7..d6403da9 100644 --- a/libgwater-xcb-nolibtool.mk +++ b/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) diff --git a/libgwater b/subprojects/libgwater -Subproject 60e5e71e09e573bd5c7839ce4a892747ea23252 +Subproject 60e5e71e09e573bd5c7839ce4a892747ea23252 |