diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2017-11-15 11:48:25 +0900 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2017-11-15 11:48:55 +0900 |
| commit | 2cea85db388d34337676466ef7f50c22e685c7d0 (patch) | |
| tree | db77053452fbdd3711ac90a14b8a1e88af517328 /Makefile.am | |
| parent | 44bb0c18480f5094fcd0c8be93de87be5c1d78c5 (diff) | |
| download | efl-2cea85db388d34337676466ef7f50c22e685c7d0.tar.gz | |
Revert series of patches from cedric (due to dependencies and conflicts)
Revert "elementary: currently double declare elm_init/shutdown."
This reverts commit 44bb0c18480f5094fcd0c8be93de87be5c1d78c5.
Revert "elementary: fix efl_ui_multibutton installed headers."
This reverts commit 32a213dc722be2bfec5fb2b513dd556cfb7e9f33.
Revert "elementary: introduce Efl_Ui.h."
This reverts commit df3d3f7334a79f1ab661b31787002f50af59b3f3.
Revert "ecore: do not display error message on cancel."
This reverts commit 99654b7cd29b418e0308be350c8d26208c0905a8.
Revert "efl: and don't forget to install the new dependencies."
This reverts commit 814ffb9b6bd50d498bfd98f4b8a75f1cad3cc0cf.
Revert "ecore: remove EFL_OBJECT_BETA as Efl_Core.h is for Efl new inerfaces."
This reverts commit 619d0f3cff023414feb8f2aaeebf468806c50b44.
Revert "ecore: move EAPI_MAIN from elementary to ecore."
This reverts commit e5d84da864214b9f772808040f22e1614889a25f.
as such commit e5d84da864214b9f772808040f22e1614889a25f starts the
breaking. enlightenment, terminologya and other apps can't compile
against that efl anymore. 619d0f3cff023414feb8f2aaeebf468806c50b44
then makes this even worse with even more header errors and undefined
types. on top of this df3d3f7334a79f1ab661b31787002f50af59b3f3 then
starts making elementary_test segfault when it runs. it wont even
start up.
asu such of these 7 commits in the first 4 (that are then relied on
later) 3 of these first 4 cause serious breakage. this simply is a
complete lack of testing changes, so i've rolled fl back to before
these things so it builds and works again and you can build against it.
PLEASE test these things. this looks ot me to be obviously a lack of
any testing... :(
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 8fb921c734..1106b60b01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -136,9 +136,7 @@ pc/emile.pc \ pc/eet.pc \ pc/evas.pc \ pc/ecore.pc \ -pc/efl-core.pc \ pc/ecore-con.pc \ -pc/efl-net.pc \ pc/ecore-ipc.pc \ pc/ecore-file.pc \ pc/ecore-input.pc \ @@ -159,8 +157,7 @@ pc/emotion.pc \ pc/ethumb.pc \ pc/ethumb_client.pc \ pc/elocation.pc \ -pc/elementary.pc \ -pc/efl-ui.pc +pc/elementary.pc if HAVE_CXX11 pkgconfig_DATA += \ |