mirror of https://github.com/nirenjan/libx52.git
refactor: Move support libraries to subprojects directory
This change is necessary to support Meson subprojectsmigrate-to-meson-build
parent
20804c6830
commit
29d6b64d18
|
@ -7,7 +7,7 @@
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
# Build any support libraries first
|
# Build any support libraries first
|
||||||
SUBDIRS = lib
|
SUBDIRS = subprojects
|
||||||
|
|
||||||
if USE_NLS
|
if USE_NLS
|
||||||
SUBDIRS += po
|
SUBDIRS += po
|
||||||
|
|
|
@ -135,12 +135,12 @@ AC_CONFIG_HEADERS([config.h])
|
||||||
|
|
||||||
AC_CONFIG_FILES([ po/Makefile.in
|
AC_CONFIG_FILES([ po/Makefile.in
|
||||||
Makefile
|
Makefile
|
||||||
lib/Makefile
|
subprojects/Makefile
|
||||||
libx52/libx52.pc
|
libx52/libx52.pc
|
||||||
libx52io/libx52io.pc
|
libx52io/libx52io.pc
|
||||||
libx52util/libx52util.pc
|
libx52util/libx52util.pc
|
||||||
lib/pinelog/Makefile
|
subprojects/pinelog/Makefile
|
||||||
lib/inih/Makefile
|
subprojects/inih/Makefile
|
||||||
udev/60-saitek-x52-x52pro.rules
|
udev/60-saitek-x52-x52pro.rules
|
||||||
])
|
])
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
|
@ -26,8 +26,8 @@ x52d_CFLAGS = \
|
||||||
-I $(top_srcdir)/libx52io \
|
-I $(top_srcdir)/libx52io \
|
||||||
-I $(top_srcdir)/libx52 \
|
-I $(top_srcdir)/libx52 \
|
||||||
-I $(top_srcdir)/libx52util \
|
-I $(top_srcdir)/libx52util \
|
||||||
-I $(top_srcdir)/lib/pinelog \
|
-I $(top_srcdir)/subprojects/pinelog \
|
||||||
-I $(top_srcdir)/lib/inih \
|
-I $(top_srcdir)/subprojects/inih \
|
||||||
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||||
-DLOCALEDIR=\"$(localedir)\" \
|
-DLOCALEDIR=\"$(localedir)\" \
|
||||||
-DLOGDIR=\"$(localstatedir)/log\" \
|
-DLOGDIR=\"$(localstatedir)/log\" \
|
||||||
|
@ -36,8 +36,8 @@ x52d_CFLAGS = \
|
||||||
|
|
||||||
x52d_LDFLAGS = @PTHREAD_LIBS@ $(WARN_LDFLAGS)
|
x52d_LDFLAGS = @PTHREAD_LIBS@ $(WARN_LDFLAGS)
|
||||||
x52d_LDADD = \
|
x52d_LDADD = \
|
||||||
lib/pinelog/libpinelog.la \
|
subprojects/pinelog/libpinelog.la \
|
||||||
lib/inih/libinih.la \
|
subprojects/inih/libinih.la \
|
||||||
libx52.la \
|
libx52.la \
|
||||||
@LTLIBINTL@
|
@LTLIBINTL@
|
||||||
|
|
||||||
|
@ -125,11 +125,11 @@ x52d_mouse_test_CFLAGS = \
|
||||||
-I $(top_srcdir) \
|
-I $(top_srcdir) \
|
||||||
-I $(top_srcdir)/libx52 \
|
-I $(top_srcdir)/libx52 \
|
||||||
-I $(top_srcdir)/libx52io \
|
-I $(top_srcdir)/libx52io \
|
||||||
-I $(top_srcdir)/lib/pinelog \
|
-I $(top_srcdir)/subprojects/pinelog \
|
||||||
$(WARN_CFLAGS) @CMOCKA_CFLAGS@
|
$(WARN_CFLAGS) @CMOCKA_CFLAGS@
|
||||||
x52d_mouse_test_LDFLAGS = @CMOCKA_LIBS@ $(WARN_LDFLAGS)
|
x52d_mouse_test_LDFLAGS = @CMOCKA_LIBS@ $(WARN_LDFLAGS)
|
||||||
x52d_mouse_test_LDADD = \
|
x52d_mouse_test_LDADD = \
|
||||||
lib/pinelog/libpinelog.la \
|
subprojects/pinelog/libpinelog.la \
|
||||||
@LTLIBINTL@
|
@LTLIBINTL@
|
||||||
|
|
||||||
TESTS += x52d-mouse-test
|
TESTS += x52d-mouse-test
|
||||||
|
|
Loading…
Reference in New Issue