discomfitor pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/desksanity.git/commit/?id=289f356c281de31471f5bce957ab696b01e8dad8
commit 289f356c281de31471f5bce957ab696b01e8dad8 Author: Mike Blumenkrantz <[email protected]> Date: Sun Dec 20 19:24:50 2015 -0500 move to single makefile build --- Makefile.am | 6 ++++-- configure.ac | 1 - src/Makefile.am | 27 --------------------------- src/Makefile.mk | 24 ++++++++++++++++++++++++ 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/Makefile.am b/Makefile.am index ebe7e4e..a52b50e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ ACLOCAL_AMFLAGS = -I m4 +AUTOMAKE_OPTIONS = subdir-objects + MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \ config.sub configure compile depcomp install-sh ltmain.sh \ missing module.desktop config.rpath mkinstalldirs -SUBDIRS = src - #if HAVE_PO #SUBDIRS += po @@ -23,6 +23,8 @@ glow_bottom.png \ glow_top.png +include src/Makefile.mk + e-module-desksanity.edj: e-module-desksanity.edc $(EDJE_CC) -id $(top_srcdir) $< $@ diff --git a/configure.ac b/configure.ac index e546c88..54f9908 100644 --- a/configure.ac +++ b/configure.ac @@ -55,7 +55,6 @@ AC_MSG_RESULT(${EDJE_CC}) AC_OUTPUT([ Makefile -src/Makefile module.desktop e_modules-desksanity.spec ], [ diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index a3e5990..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -AM_CPPFLAGS = -I. \ - -I$(top_srcdir) \ - -I$(includedir) \ - -DLOCALEDIR=\"$(datadir)/locale\" \ - -DPACKAGE_DATA_DIR=\"$(module_dir)/$(PACKAGE)\" \ - @E_CFLAGS@ - -pkgdir = $(module_dir)/$(PACKAGE)/$(MODULE_ARCH) -pkg_LTLIBRARIES = module.la -module_la_SOURCES = e_mod_main.h \ - e_mod_main.c \ - ds_config.c \ - maximize.c \ - moveresize.c \ - pip.c \ - zoom.c \ - magnify.c \ - desksanity.c - -module_la_LIBADD = @E_LIBS@ -module_la_LDFLAGS = -module -avoid-version -module_la_DEPENDENCIES = $(top_builddir)/config.h - -clean-local: - rm -rf *~ diff --git a/src/Makefile.mk b/src/Makefile.mk new file mode 100644 index 0000000..1649c6b --- /dev/null +++ b/src/Makefile.mk @@ -0,0 +1,24 @@ +AM_CPPFLAGS = \ +-Isrc \ +-I$(top_srcdir) \ +-I$(includedir) \ +-DLOCALEDIR=\"$(datadir)/locale\" \ +-DPACKAGE_DATA_DIR=\"$(module_dir)/$(PACKAGE)\" \ +@E_CFLAGS@ + +pkgdir = $(module_dir)/$(PACKAGE)/$(MODULE_ARCH) +pkg_LTLIBRARIES = module.la +module_la_SOURCES = \ +src/e_mod_main.h \ +src/e_mod_main.c \ +src/ds_config.c \ +src/maximize.c \ +src/moveresize.c \ +src/pip.c \ +src/zoom.c \ +src/magnify.c \ +src/desksanity.c + +module_la_LIBADD = @E_LIBS@ +module_la_LDFLAGS = -module -avoid-version +module_la_DEPENDENCIES = $(top_builddir)/config.h --
