From: <enl...@li...> - 2003-10-16 17:30:18
|
Enlightenment CVS committal Author : tsauerbeck Project : misc Module : eplayer Dir : misc/eplayer/src Modified Files: Makefile.am interface.c Log Message: Implemented install and dist targets for make, improved libao check in configure.ac =================================================================== RCS file: /cvsroot/enlightenment/misc/eplayer/src/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 16 Oct 2003 14:54:33 -0000 1.4 +++ Makefile.am 16 Oct 2003 17:25:40 -0000 1.5 @@ -1,12 +1,8 @@ -## ePlayer Makefile.am -## gcc -g -lao -lvorbis -lvorbisfile -lecore -lecore_evas e_player.c -o e_player - -INCLUDES = -I$(top_srcdir) -I$(includedir) \ +AM_CFLAGS = @AO_CFLAGS@ \ @ECORE_CFLAGS@ @EVAS_CFLAGS@ @EDJE_CFLAGS@ @ESMART_CFLAGS@ bin_PROGRAMS = eplayer -### I think e_player_HEADER is more correct but not doc'ed. eplayer_SOURCES = eplayer.c eplayer.h \ interface.c interface.h \ callbacks.c callbacks.h \ @@ -14,5 +10,5 @@ playlist.c playlist.h \ mixer.c mixer.h -eplayer_LDADD = -lao -lvorbis -lvorbisfile \ +eplayer_LDADD = -lvorbis -lvorbisfile @AO_LIBS@ \ @ECORE_LIBS@ @EVAS_LIBS@ @EDJE_LIBS@ @ESMART_LIBS@ =================================================================== RCS file: /cvsroot/enlightenment/misc/eplayer/src/interface.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- interface.c 16 Oct 2003 14:54:33 -0000 1.3 +++ interface.c 16 Oct 2003 17:25:40 -0000 1.4 @@ -45,8 +45,7 @@ ecore_evas_callback_move_set(ee, window_move); player->gui.evas = ecore_evas_get(ee); - evas_font_path_append(player->gui.evas, "../data/"); - evas_font_path_append(player->gui.evas, "../data/fonts/"); + evas_font_path_append(player->gui.evas, DATA_DIR"/themes/fonts"); /* EDJE */ #ifdef DEBUG @@ -54,8 +53,8 @@ #endif player->gui.edje = edje_object_add(player->gui.evas); - edje_object_file_set(player->gui.edje, "../data/eplayer.eet", - "eplayer"); + edje_object_file_set(player->gui.edje, + DATA_DIR"/themes/eplayer.eet", "eplayer"); evas_object_move(player->gui.edje, 0, 0); edje_object_size_min_get(player->gui.edje, &edje_w, &edje_h); evas_object_resize(player->gui.edje, edje_w, edje_h); @@ -140,7 +139,7 @@ /* add the title/length items to the container */ for (i = 0; i < 2; i++) { o = edje_object_add(player->gui.evas); - edje_object_file_set(o, "../data/eplayer.eet", name[i]); + edje_object_file_set(o, DATA_DIR"/themes/eplayer.eet", name[i]); edje_object_part_text_set(o, "text", i ? len : title); edje_object_size_min_get(o, &w, &h); evas_object_resize(o, w, h); |