summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2016-03-23 23:52:21 -0700
committerCedric BAIL <cedric@osg.samsung.com>2016-03-24 11:23:11 -0700
commit73895f524922f004aadbb10e91f1c327b9ada2f0 (patch)
treeb49c8ca7c5ee19d4f4a1048f1ef897dadd5cf03d
parent6ffdc07f76a4470538eb74aa94699f9f2a474723 (diff)
downloadefl-devs/cedric/elm_merge.tar.gz
elementary: remove useless Makefile.am and force file in the correct place.devs/cedric/elm_merge
-rw-r--r--src/Makefile_Elementary.am1
-rw-r--r--src/static_libs/atspi/Makefile.am4
2 files changed, 1 insertions, 4 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 292fbe8388..335473a1a5 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -498,6 +498,7 @@ includesubdir = $(includedir)/elementary-@VMAJ@/
lib_elementary_libelementary_la_SOURCES = \
lib/elementary/elm_priv.h \
+ static_libs/atspi/atspi-constants.h \
lib/elementary/elementary_config.h \
lib/elementary/els_box.h \
lib/elementary/elc_ctxpopup.c \
diff --git a/src/static_libs/atspi/Makefile.am b/src/static_libs/atspi/Makefile.am
deleted file mode 100644
index fa32175f15..0000000000
--- a/src/static_libs/atspi/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-AUTOMAKE_OPTIONS = 1.4 foreign
-MAINTAINERCLEANFILES = Makefile.in
-
-noinst_HEADERS = atspi-constants.h