summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2017-11-14 20:08:09 -0800
committerCedric Bail <cedric@osg.samsung.com>2017-11-14 20:08:09 -0800
commit663e31413a21030be8989eee82204f9351d2517c (patch)
tree8e255086a213704428078edfd57ce3727e0fb68b /Makefile.am
parent2cea85db388d34337676466ef7f50c22e685c7d0 (diff)
Revert "Revert series of patches from cedric (due to dependencies and conflicts)"
This reverts commit 2cea85db388d34337676466ef7f50c22e685c7d0. Their was a typo that I made during cleanup of the patch before pushing that I didn't notice broke some stuff. But also you may have an old efl_general.h in your elementary directory that is now being picked instead of the one provided by the tree.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 1106b60..8fb921c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -136,7 +136,9 @@ pc/emile.pc \
136pc/eet.pc \ 136pc/eet.pc \
137pc/evas.pc \ 137pc/evas.pc \
138pc/ecore.pc \ 138pc/ecore.pc \
139pc/efl-core.pc \
139pc/ecore-con.pc \ 140pc/ecore-con.pc \
141pc/efl-net.pc \
140pc/ecore-ipc.pc \ 142pc/ecore-ipc.pc \
141pc/ecore-file.pc \ 143pc/ecore-file.pc \
142pc/ecore-input.pc \ 144pc/ecore-input.pc \
@@ -157,7 +159,8 @@ pc/emotion.pc \
157pc/ethumb.pc \ 159pc/ethumb.pc \
158pc/ethumb_client.pc \ 160pc/ethumb_client.pc \
159pc/elocation.pc \ 161pc/elocation.pc \
160pc/elementary.pc 162pc/elementary.pc \
163pc/efl-ui.pc
161 164
162if HAVE_CXX11 165if HAVE_CXX11
163pkgconfig_DATA += \ 166pkgconfig_DATA += \