diff --git a/Makefile.am b/Makefile.am index f031c558f..dac1065cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,14 +4,17 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ config.h.in config.sub configure install-sh \ ltconfig ltmain.sh missing mkinstalldirs \ stamp-h.in acconfig.h \ - enlightenment.spec + enlightenment.spec enlightenment.pc bin_SCRIPTS = enlightenment-config EXTRA_DIST = config.rpath README AUTHORS COPYING COPYING-PLAIN \ - enlightenment.spec.in enlightenment.spec + enlightenment.spec.in enlightenment.spec enlightenment.pc filesdir = $(datadir)/enlightenment/ files_DATA = AUTHORS COPYING ACLOCAL_AMFLAGS = -I m4 + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = enlightenment.pc diff --git a/configure.in b/configure.in index f0169f1c4..c3f73acf6 100644 --- a/configure.in +++ b/configure.in @@ -265,6 +265,7 @@ AC_DEFINE(E_INTERNAL, 1, "This define can be used to wrap internal E stuff, as c AC_OUTPUT([ Makefile enlightenment.spec +enlightenment.pc src/Makefile src/bin/Makefile src/modules/Makefile diff --git a/enlightenment.pc.in b/enlightenment.pc.in new file mode 100644 index 000000000..fda20807b --- /dev/null +++ b/enlightenment.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: enlightenment +Description: Enlightenmnt Window Manager +Version: @VERSION@ +Libs: +Libs.private: +Cflags: -I${includedir} + diff --git a/src/bin/e_fm_hal.c b/src/bin/e_fm_hal.c index 48650a105..031de46a7 100644 --- a/src/bin/e_fm_hal.c +++ b/src/bin/e_fm_hal.c @@ -130,6 +130,7 @@ e_fm2_hal_volume_add(E_Volume *v) if ((!v->mount_point) || (v->mount_point[0] == 0)) { if (v->mount_point) free(v->mount_point); + v->mount_point = NULL; v->mount_point = e_fm2_hal_volume_mountpoint_get(v); if ((!v->mount_point) || (v->mount_point[0] == 0)) { @@ -137,6 +138,7 @@ e_fm2_hal_volume_add(E_Volume *v) char *id; if (v->mount_point) free(v->mount_point); + v->mount_point = NULL; id = "disk"; if ((v->uuid) && (v->uuid[0])) id = v->uuid; if (ecore_file_is_dir("/media")) diff --git a/src/bin/e_slidesel.c b/src/bin/e_slidesel.c index a773c8ada..8ba7f2399 100644 --- a/src/bin/e_slidesel.c +++ b/src/bin/e_slidesel.c @@ -155,7 +155,7 @@ _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info) if (sd->cur) { /* get rid of accidental release and presses */ - if ((t - sd->down_time) > 0.2) +// if ((t - sd->down_time) > 0.2) { edje_object_signal_emit(sd->edje_obj, "e,action,select", "e"); if (sd->cur->func) sd->cur->func(sd->cur->data);