Browse files

reorganize build system

  • Loading branch information...
1 parent 2d28e13 commit c72453d4af151795a7769daa2abece18e403b466 @billiob committed May 25, 2011
Showing with 30 additions and 22 deletions.
  1. +4 −20 Makefile.am
  2. +8 −1 configure.ac
  3. +18 −0 data/Makefile.am
  4. +0 −1 src/Makefile.am
View
24 Makefile.am
@@ -1,22 +1,6 @@
-ACLOCAL_AMFLAGS = -I m4
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
- config.sub configure depcomp install-sh ltmain.sh \
- missing module.desktop config.rpath mkinstalldirs
-
-SUBDIRS = src
-
-EDJE_FLAGS = -v
-
-filesdir = $(datadir)
-files_DATA = eenvaders.edj
+AUTOMAKE_OPTIONS = 1.4 foreign
+MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = data/eenvaders.edc
+SUBDIRS = src data
-eenvaders.edj: data/eenvaders.edc
- $(EDJE_CC) $(EDJE_FLAGS) $< $@
-
-clean-local:
- rm -rf eenvaders.edj *~
-
-uninstall:
- rm -rf $(DESTDIR)$(datadir)
+ACLOCAL_AMFLAGS = -I m4
View
9 configure.ac
@@ -17,12 +17,15 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_PROG_CC_C99
AC_HEADER_STDC
AC_C_CONST
+AM_PROG_CC_C_O
define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
AC_PROG_LIBTOOL
PKG_CHECK_MODULES(ECORE_EVAS, [ecore-evas])
+PKG_CHECK_MODULES(ENLIGHTENMENT, [enlightenment])
+datadir_edj=$(pkg-config --variable=prefix enlightenment)/share/enlightenment/data/backgrounds
PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
vmaj=$(pkg-config --variable=vmaj edje)
@@ -47,11 +50,15 @@ AC_MSG_RESULT(${EDJE_CC})
datadir=$(pkg-config --variable=modules edje)/${PACKAGE}
AC_ARG_ENABLE(homedir-install,
AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]),
- [ datadir="${HOME}/.edje/modules/${PACKAGE}" ]
+ [
+ datadir="${HOME}/.edje/modules/${PACKAGE}";
+ datadir_edj="${HOME}/.e/e/backgrounds"
+ ]
)
AC_OUTPUT([
Makefile
+data/Makefile
src/Makefile
], [
])
View
18 data/Makefile.am
@@ -0,0 +1,18 @@
+AUTOMAKE_OPTIONS = 1.4 foreign
+MAINTAINERCLEANFILES = Makefile.in
+
+EDJE_FLAGS = -v
+
+filesdir = $(datadir_edj)
+files_DATA = eenvaders.edj
+
+EXTRA_DIST = eenvaders.edc
+
+eenvaders.edj: eenvaders.edc
+ $(EDJE_CC) $(EDJE_FLAGS) $< $@
+
+clean-local:
+ rm -rf eenvaders.edj *~
+
+uninstall:
+ rm -rf $(DESTDIR)$(datadir_edj)/eenvaders.edj
View
1 src/Makefile.am
@@ -16,7 +16,6 @@ module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h
bin_PROGRAMS = eenvaders
-EXTRA_PROGRAMS = eenvaders
eenvaders_SOURCES = \
eenvaders_evas_smart.c \

0 comments on commit c72453d

Please sign in to comment.