Commit c3a88a89 authored by netfab's avatar netfab

Kill automake SUBDIRS.

Thanks to Václav Haisman.

https://lists.gnu.org/archive/html/automake/2018-01/msg00014.html
parent 083827ea
...@@ -3,6 +3,11 @@ ACLOCAL_AMFLAGS = -I m4 ...@@ -3,6 +3,11 @@ ACLOCAL_AMFLAGS = -I m4
DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-wall --enable-gcc-werror --enable-as-needed DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-wall --enable-gcc-werror --enable-as-needed
SUBDIRS = data src include %D%/src/include/Makefile.am
include %D%/src/lib/utils/Makefile.am
include %D%/src/lib/dbus/Makefile.am
include %D%/src/lib/shared/Makefile.am
include %D%/src/bin/daemon/Makefile.am
include %D%/src/bin/service/Makefile.am
include %D%/data/dbus/Makefile.am
...@@ -175,18 +175,7 @@ AX_PTHREAD ...@@ -175,18 +175,7 @@ AX_PTHREAD
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
data/Makefile
data/dbus/Makefile
data/dbus/GLogiK.conf data/dbus/GLogiK.conf
src/Makefile
src/include/Makefile
src/lib/Makefile
src/lib/utils/Makefile
src/lib/dbus/Makefile
src/lib/shared/Makefile
src/bin/Makefile
src/bin/daemon/Makefile
src/bin/service/Makefile
]) ])
# Generate config.status and launch it. # Generate config.status and launch it.
......
dbus_system_dir = $(datadir)/dbus-1/system.d/ dbus_system_dir = $(datadir)/dbus-1/system.d/
dist_dbus_system__DATA = GLogiK.conf dist_dbus_system__DATA = %D%/GLogiK.conf
SUBDIRS = include lib bin
SUBDIRS = daemon service
...@@ -22,20 +22,30 @@ GLogiKd_LDADD = \ ...@@ -22,20 +22,30 @@ GLogiKd_LDADD = \
@BOOST_IOSTREAMS_LIB@ \ @BOOST_IOSTREAMS_LIB@ \
@LIBUDEV_LIBS@ \ @LIBUDEV_LIBS@ \
@PTHREAD_LIBS@ \ @PTHREAD_LIBS@ \
../../lib/utils/libGLogiKUtils.la \ libGLogiKUtils.la \
../../lib/dbus/libGLogiKDBus.la \ libGLogiKDBus.la \
../../lib/shared/libGLogiKShared.la libGLogiKShared.la
GLogiKd_SOURCES = \ GLogiKd_SOURCES = \
main.cpp \ %D%/main.cpp \
daemon.cpp daemon.h \ %D%/daemon.cpp \
daemonControl.cpp daemonControl.h \ %D%/daemon.h \
devicesManager.cpp devicesManager.h \ %D%/daemonControl.cpp \
keyboardDriver.cpp keyboardDriver.h \ %D%/daemonControl.h \
virtualKeyboard.cpp virtualKeyboard.h \ %D%/devicesManager.cpp \
logitechG510.cpp logitechG510.h \ %D%/devicesManager.h \
macrosManager.cpp macrosManager.h \ %D%/keyboardDriver.cpp \
clientsManager.cpp clientsManager.h \ %D%/keyboardDriver.h \
clientsSignals.cpp clientsSignals.h \ %D%/virtualKeyboard.cpp \
client.cpp client.h %D%/virtualKeyboard.h \
%D%/logitechG510.cpp \
%D%/logitechG510.h \
%D%/macrosManager.cpp \
%D%/macrosManager.h \
%D%/clientsManager.cpp \
%D%/clientsManager.h \
%D%/clientsSignals.cpp \
%D%/clientsSignals.h \
%D%/client.cpp \
%D%/client.h
...@@ -14,13 +14,17 @@ GLogiKs_LDADD = \ ...@@ -14,13 +14,17 @@ GLogiKs_LDADD = \
@BOOST_SERIALIZATION_LIB@ \ @BOOST_SERIALIZATION_LIB@ \
@BOOST_SYSTEM_LIB@ \ @BOOST_SYSTEM_LIB@ \
@BOOST_FILESYSTEM_LIB@ \ @BOOST_FILESYSTEM_LIB@ \
../../lib/dbus/libGLogiKDBus.la \ libGLogiKDBus.la \
../../lib/utils/libGLogiKUtils.la \ libGLogiKUtils.la \
../../lib/shared/libGLogiKShared.la libGLogiKShared.la
GLogiKs_SOURCES = \ GLogiKs_SOURCES = \
main.cpp \ %D%/main.cpp \
service.cpp service.h \ %D%/service.cpp \
serviceDBusHandler.cpp serviceDBusHandler.h \ %D%/service.h \
devicesHandler.cpp devicesHandler.h \ %D%/serviceDBusHandler.cpp \
warningCheck.cpp warningCheck.h %D%/serviceDBusHandler.h \
%D%/devicesHandler.cpp \
%D%/devicesHandler.h \
%D%/warningCheck.cpp \
%D%/warningCheck.h
EXTRA_DIST = enums.h EXTRA_DIST = %D%/enums.h
SUBDIRS = utils dbus shared
lib_LTLIBRARIES=libGLogiKDBus.la lib_LTLIBRARIES += libGLogiKDBus.la
libGLogiKDBus_la_CXXFLAGS = \ libGLogiKDBus_la_CXXFLAGS = \
@AM_CXXFLAGS@ \ @AM_CXXFLAGS@ \
...@@ -10,37 +10,64 @@ libGLogiKDBus_la_LDFLAGS = \ ...@@ -10,37 +10,64 @@ libGLogiKDBus_la_LDFLAGS = \
libGLogiKDBus_la_LIBADD = \ libGLogiKDBus_la_LIBADD = \
$(DBUS_LIBS) \ $(DBUS_LIBS) \
../utils/libGLogiKUtils.la libGLogiKUtils.la
# events/GKDBusEventStringToVoid.cpp events/GKDBusEventStringToVoid.h # events/GKDBusEventStringToVoid.cpp events/GKDBusEventStringToVoid.h
libGLogiKDBus_la_SOURCES = \ libGLogiKDBus_la_SOURCES = \
GKDBusConnection.h \ %D%/arguments/GKDBusArgument.cpp \
GKDBus.cpp GKDBus.h \ %D%/arguments/GKDBusArgument.h \
arguments/GKDBusArgument.cpp arguments/GKDBusArgument.h \ %D%/arguments/GKDBusArgString.cpp \
arguments/GKDBusArgString.cpp arguments/GKDBusArgString.h \ %D%/arguments/GKDBusArgString.h \
arguments/GKDBusArgBoolean.cpp arguments/GKDBusArgBoolean.h \ %D%/arguments/GKDBusArgBoolean.cpp \
arguments/GKDBusArgByte.cpp arguments/GKDBusArgByte.h \ %D%/arguments/GKDBusArgBoolean.h \
arguments/GKDBusArgUInt16.cpp arguments/GKDBusArgUInt16.h \ %D%/arguments/GKDBusArgByte.cpp \
arguments/GKDBusArgMacro.cpp arguments/GKDBusArgMacro.h \ %D%/arguments/GKDBusArgByte.h \
arguments/GKDBusArgMacrosBank.cpp arguments/GKDBusArgMacrosBank.h \ %D%/arguments/GKDBusArgUInt16.cpp \
messages/GKDBusMessage.cpp messages/GKDBusMessage.h \ %D%/arguments/GKDBusArgUInt16.h \
messages/GKDBusReply.cpp messages/GKDBusReply.h \ %D%/arguments/GKDBusArgMacro.cpp \
messages/GKDBusErrorReply.cpp messages/GKDBusErrorReply.h \ %D%/arguments/GKDBusArgMacro.h \
messages/GKDBusRemoteMethodCall.cpp messages/GKDBusRemoteMethodCall.h \ %D%/arguments/GKDBusArgMacrosBank.cpp \
messages/GKDBusBroadcastSignal.cpp messages/GKDBusBroadcastSignal.h \ %D%/arguments/GKDBusArgMacrosBank.h \
messages/GKDBusTargetsSignal.cpp messages/GKDBusTargetsSignal.h \ %D%/messages/GKDBusMessage.cpp \
events/GKDBusEvent.cpp events/GKDBusEvent.h \ %D%/messages/GKDBusMessage.h \
events/GKDBusEventVoidToVoid.cpp events/GKDBusEventVoidToVoid.h \ %D%/messages/GKDBusReply.cpp \
events/GKDBusEventStringToBool.cpp events/GKDBusEventStringToBool.h \ %D%/messages/GKDBusReply.h \
events/GKDBusEventTwoStringsToBool.cpp events/GKDBusEventTwoStringsToBool.h \ %D%/messages/GKDBusErrorReply.cpp \
events/GKDBusEventStringToString.cpp events/GKDBusEventStringToString.h \ %D%/messages/GKDBusErrorReply.h \
events/GKDBusEventTwoStringsToString.cpp events/GKDBusEventTwoStringsToString.h \ %D%/messages/GKDBusRemoteMethodCall.cpp \
events/GKDBusEventStringToStringsArray.cpp events/GKDBusEventStringToStringsArray.h \ %D%/messages/GKDBusRemoteMethodCall.h \
events/GKDBusEventTwoStringsToStringsArray.cpp events/GKDBusEventTwoStringsToStringsArray.h \ %D%/messages/GKDBusBroadcastSignal.cpp \
events/GKDBusEventTwoStringsOneByteToBool.cpp events/GKDBusEventTwoStringsOneByteToBool.h \ %D%/messages/GKDBusBroadcastSignal.h \
events/GKDBusEventTwoStringsThreeBytesToBool.cpp events/GKDBusEventTwoStringsThreeBytesToBool.h \ %D%/messages/GKDBusTargetsSignal.cpp \
events/GKDBusEventTwoStringsOneByteOneMacrosBankToBool.cpp GKDBusEventTwoStringsOneByteOneMacrosBankToBool.h \ %D%/messages/GKDBusTargetsSignal.h \
events/GKDBusEventThreeStringsOneByteToMacro.cpp events/GKDBusEventThreeStringsOneByteToMacro.h \ %D%/events/GKDBusEvent.cpp \
events/GKDBusEventStringsArrayToVoid.cpp events/GKDBusEventStringsArrayToVoid.h \ %D%/events/GKDBusEvent.h \
GKDBusEvents.cpp GKDBusEvents.h %D%/events/GKDBusEventVoidToVoid.cpp \
%D%/events/GKDBusEventVoidToVoid.h \
%D%/events/GKDBusEventStringToBool.cpp \
%D%/events/GKDBusEventStringToBool.h \
%D%/events/GKDBusEventTwoStringsToBool.cpp \
%D%/events/GKDBusEventTwoStringsToBool.h \
%D%/events/GKDBusEventStringToString.cpp \
%D%/events/GKDBusEventStringToString.h \
%D%/events/GKDBusEventTwoStringsToString.cpp \
%D%/events/GKDBusEventTwoStringsToString.h \
%D%/events/GKDBusEventStringToStringsArray.cpp \
%D%/events/GKDBusEventStringToStringsArray.h \
%D%/events/GKDBusEventTwoStringsToStringsArray.cpp \
%D%/events/GKDBusEventTwoStringsToStringsArray.h \
%D%/events/GKDBusEventTwoStringsOneByteToBool.cpp \
%D%/events/GKDBusEventTwoStringsOneByteToBool.h \
%D%/events/GKDBusEventTwoStringsThreeBytesToBool.cpp \
%D%/events/GKDBusEventTwoStringsThreeBytesToBool.h \
%D%/events/GKDBusEventTwoStringsOneByteOneMacrosBankToBool.cpp \
%D%/events/GKDBusEventTwoStringsOneByteOneMacrosBankToBool.h \
%D%/events/GKDBusEventThreeStringsOneByteToMacro.cpp \
%D%/events/GKDBusEventThreeStringsOneByteToMacro.h \
%D%/events/GKDBusEventStringsArrayToVoid.cpp \
%D%/events/GKDBusEventStringsArrayToVoid.h \
%D%/GKDBusConnection.h \
%D%/GKDBus.cpp GKDBus.h \
%D%/GKDBusEvents.cpp \
%D%/GKDBusEvents.h
lib_LTLIBRARIES=libGLogiKShared.la lib_LTLIBRARIES += libGLogiKShared.la
libGLogiKShared_la_CXXFLAGS = \ libGLogiKShared_la_CXXFLAGS = \
@AM_CXXFLAGS@ \ @AM_CXXFLAGS@ \
...@@ -15,12 +15,17 @@ libGLogiKShared_la_LIBADD = \ ...@@ -15,12 +15,17 @@ libGLogiKShared_la_LIBADD = \
@BOOST_SERIALIZATION_LIB@ \ @BOOST_SERIALIZATION_LIB@ \
@BOOST_SYSTEM_LIB@ \ @BOOST_SYSTEM_LIB@ \
@BOOST_FILESYSTEM_LIB@ \ @BOOST_FILESYSTEM_LIB@ \
../utils/libGLogiKUtils.la libGLogiKUtils.la
libGLogiKShared_la_SOURCES = \ libGLogiKShared_la_SOURCES = \
keyEvent.h \ %D%/keyEvent.h \
macrosBanks.cpp macrosBanks.h \ %D%/macrosBanks.cpp \
deviceConfigurationFile.cpp deviceConfigurationFile.h \ %D%/macrosBanks.h \
deviceProperties.cpp deviceProperties.h \ %D%/deviceConfigurationFile.cpp \
glogik.cpp glogik.h \ %D%/deviceConfigurationFile.h \
sessionManager.cpp sessionManager.h %D%/deviceProperties.cpp \
%D%/deviceProperties.h \
%D%/glogik.cpp \
%D%/glogik.h \
%D%/sessionManager.cpp \
%D%/sessionManager.h
lib_LTLIBRARIES=libGLogiKUtils.la lib_LTLIBRARIES = libGLogiKUtils.la
libGLogiKUtils_la_CXXFLAGS = \ libGLogiKUtils_la_CXXFLAGS = \
@AM_CXXFLAGS@ \ @AM_CXXFLAGS@ \
...@@ -14,10 +14,15 @@ libGLogiKUtils_la_LIBADD = \ ...@@ -14,10 +14,15 @@ libGLogiKUtils_la_LIBADD = \
@BOOST_FILESYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@
libGLogiKUtils_la_SOURCES = \ libGLogiKUtils_la_SOURCES = \
randomGenerator.cpp randomGenerator.h \ %D%/randomGenerator.cpp \
filesystem.cpp filesystem.h \ %D%/randomGenerator.h \
functions.cpp functions.h \ %D%/filesystem.cpp \
exception.cpp exception.h \ %D%/filesystem.h \
XDGUserDirs.cpp XDGUserDirs.h \ %D%/functions.cpp \
log.h \ %D%/functions.h \
utils.h %D%/exception.cpp \
%D%/exception.h \
%D%/XDGUserDirs.cpp \
%D%/XDGUserDirs.h \
%D%/log.h \
%D%/utils.h
...@@ -19,20 +19,17 @@ GLogiK=$PWD/.. CD=. { ...@@ -19,20 +19,17 @@ GLogiK=$PWD/.. CD=. {
macro=m4/ { macro=m4/ {
} }
data=data/ { data=data/ {
Makefile.am
dbus=dbus/ { dbus=dbus/ {
Makefile.am Makefile.am
GLogiK.conf.in GLogiK.conf.in
} }
} }
srcfiles=src/ { srcfiles=src/ {
Makefile.am
include=include/ { include=include/ {
Makefile.am Makefile.am
enums.h enums.h
} }
binaries=bin/ { binaries=bin/ {
Makefile.am
daemon=daemon/ { daemon=daemon/ {
Makefile.am Makefile.am
main.cpp main.cpp
...@@ -71,7 +68,6 @@ GLogiK=$PWD/.. CD=. { ...@@ -71,7 +68,6 @@ GLogiK=$PWD/.. CD=. {
} }
} }
libraries=lib/ { libraries=lib/ {
Makefile.am
GLogiKDBus=dbus/ { GLogiKDBus=dbus/ {
Makefile.am Makefile.am
arguments=arguments/ { arguments=arguments/ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment