E CVS: enotes vapier
Enlightenment CVS committal
Author : vapier
Project : misc
Module : enotes
Dir : misc/enotes
Modified Files:
configure.in
Log Message:
switch from -config scripts to pkg-config .pc files
===
RCS file: /cvs/e/misc/enotes/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- configure.in25 Oct 2005 00:55:45 - 1.7
+++ configure.in26 Aug 2007 22:34:19 - 1.8
@@ -64,78 +64,14 @@
packagesrcdir=`cd $srcdir && pwd`
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}",
[PACKAGE_SOURCE_DIR])
-PROG="ewl-config";
-AC_PATH_PROG(EWL_CONFIG, $PROG, "", $PATH)
-if test -z "$EWL_CONFIG" ; then
- AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
-fi
-ewl_cflags=`$EWL_CONFIG --cflags`
-ewl_libs=`$EWL_CONFIG --libs`
-AC_SUBST(ewl_cflags)
-AC_SUBST(ewl_libs)
-
-PROG="evas-config";
-AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH)
-if test -z "$EVAS_CONFIG" ; then
- AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
-fi
-evas_cflags=`$EVAS_CONFIG --cflags`
-evas_libs=`$EVAS_CONFIG --libs`
-AC_SUBST(evas_cflags)
-AC_SUBST(evas_libs)
-
-PROG="ecore-config";
-AC_PATH_PROG(ECORE_CONFIG, $PROG, "", $PATH)
-if test -z "$ECORE_CONFIG" ; then
- AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
-fi
-ecore_cflags=`$ECORE_CONFIG --cflags`
-ecore_libs=`$ECORE_CONFIG --libs`
-AC_SUBST(ecore_cflags)
-AC_SUBST(ecore_libs)
-
-PROG="imlib2-config";
-AC_PATH_PROG(IMLIB2_CONFIG, $PROG, "", $PATH)
-if test -z "$IMLIB2_CONFIG" ; then
- AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
-fi
-imlib2_cflags=`$IMLIB2_CONFIG --cflags`
-imlib2_libs=`$IMLIB2_CONFIG --libs`
-AC_SUBST(imlib2_cflags)
-AC_SUBST(imlib2_libs)
-
-
-PROG="edje-config";
-AC_PATH_PROG(EDJE_CONFIG, $PROG, "", $PATH)
-if test -z "$EDJE_CONFIG" ; then
- AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
-fi
-edje_cflags=`$EDJE_CONFIG --cflags`
-edje_libs=`$EDJE_CONFIG --libs`
-AC_SUBST(edje_cflags)
-AC_SUBST(edje_libs)
-
-
-PROG="edb-config";
-AC_PATH_PROG(EDB_CONFIG, $PROG, "", $PATH)
-if test -z "$EDB_CONFIG" ; then
- AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
-fi
-edb_cflags=`$EDB_CONFIG --cflags`
-edb_libs=`$EDB_CONFIG --libs`
-AC_SUBST(edb_cflags)
-AC_SUBST(edb_libs)
-
-
-PROG="esmart-config";
-AC_PATH_PROG(ESMART_CONFIG, $PROG, "", $PATH)
-if test -z "$ESMART_CONFIG" ; then
- AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
-fi
-esmart_cflags=`$ESMART_CONFIG --cflags`
-esmart_libs=`$ESMART_CONFIG --libs`
-AC_SUBST(esmart_cflags)
-AC_SUBST(esmart_libs)
+PKG_CHECK_MODULES(EWL, [ewl])
+PKG_CHECK_MODULES(EVAS, [evas])
+PKG_CHECK_MODULES(ECORE, [ecore])
+PKG_CHECK_MODULES(ECORE_CONFIG, [ecore-config])
+PKG_CHECK_MODULES(IMLIB2, [imlib2])
+PKG_CHECK_MODULES(EDJE, [edje])
+PKG_CHECK_MODULES(EDB, [edb])
+PKG_CHECK_MODULES(ESMART, [esmart_draggies])
CFLAGS="-Wall $CFLAGS"
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: enotes vapier
Enlightenment CVS committal Author : vapier Project : misc Module : enotes Dir : misc/enotes/src Modified Files: Makefile.am Log Message: switch from -config scripts to pkg-config .pc files === RCS file: /cvs/e/misc/enotes/src/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- Makefile.am 9 Oct 2004 16:06:34 - 1.7 +++ Makefile.am 26 Aug 2007 22:34:19 - 1.8 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in INCLUDES = \ - @ecore_cflags@ @evas_cflags@ @ewl_cflags@ @edje_cflags@ @edb_cflags@ @imlib2_cflags@ @esmart_cflags@ + @ECORE_CFLAGS@ @ECORE_CONFIG_CFLAGS@ @EVAS_CFLAGS@ @EWL_CFLAGS@ @EDJE_CFLAGS@ @EDB_CFLAGS@ @IMLIB2_CFLAGS@ @ESMART_CFLAGS@ bin_PROGRAMS = enotes @@ -29,4 +29,4 @@ menu.c \ menu.h -enotes_LDADD = @ewl_libs@ @ecore_libs@ @evas_libs@ @edje_libs@ @edb_libs@ @imlib2_libs@ @esmart_libs@ -lesmart_draggies +enotes_LDADD = @EWL_LIBS@ @ECORE_LIBS@ @ECORE_CONFIG_LIBS@ @EVAS_LIBS@ @EDJE_LIBS@ @EDB_LIBS@ @IMLIB2_LIBS@ @ESMART_LIBS@ - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: enotes vapier
Enlightenment CVS committal Author : vapier Project : misc Module : enotes Dir : misc/enotes Modified Files: .cvsignore Log Message: cvsignore === RCS file: /cvsroot/enlightenment/misc/enotes/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- .cvsignore 29 Jul 2005 16:41:05 - 1.3 +++ .cvsignore 27 Oct 2005 07:50:59 - 1.4 @@ -14,3 +14,4 @@ libtool missing stamp-h1 +ltmain.sh --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: enotes vapier
Enlightenment CVS committal
Author : vapier
Project : misc
Module : enotes
Dir : misc/enotes/src
Modified Files:
config.c config.h controlcentre.c debug.c ipc.c main.c note.c
note.h saveload.c saveload.h storage.c
Log Message:
cleanup warnings caused by missing prototypes/unused variables
===
RCS file: /cvsroot/enlightenment/misc/enotes/src/config.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- config.c6 Apr 2005 11:52:26 - 1.17
+++ config.c25 Oct 2005 01:07:53 - 1.18
@@ -11,7 +11,7 @@
**/
-#include "config.h"
+#include "note.h"
/**
* @return: Returns an allocated MainConfig variable with some default values
===
RCS file: /cvsroot/enlightenment/misc/enotes/src/config.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- config.h6 Apr 2005 11:52:26 - 1.11
+++ config.h25 Oct 2005 01:07:53 - 1.12
@@ -17,6 +17,7 @@
#include
#include
#include
+#include
#include
#include
===
RCS file: /cvsroot/enlightenment/misc/enotes/src/controlcentre.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- controlcentre.c 20 Sep 2005 18:22:29 - 1.22
+++ controlcentre.c 25 Oct 2005 01:07:53 - 1.23
@@ -11,7 +11,7 @@
**/
-#include "controlcentre.h"
+#include "note.h"
ControlCentre *controlcentre;
===
RCS file: /cvsroot/enlightenment/misc/enotes/src/debug.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- debug.c 27 Nov 2004 22:48:01 - 1.6
+++ debug.c 25 Oct 2005 01:07:53 - 1.7
@@ -11,7 +11,7 @@
**/
-#include "debug.h"
+#include "note.h"
extern MainConfig *main_config;
===
RCS file: /cvsroot/enlightenment/misc/enotes/src/ipc.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ipc.c 12 Mar 2005 23:37:15 - 1.12
+++ ipc.c 25 Oct 2005 01:07:53 - 1.13
@@ -85,8 +85,6 @@
void handle_ipc_message(void *data){
RecvMsg*p;
NoteStor *note;
- Ecore_Timer*close;
- char *msg;
char *content;
p = parse_message((char *)data);
===
RCS file: /cvsroot/enlightenment/misc/enotes/src/main.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- main.c 10 Sep 2005 21:06:13 - 1.22
+++ main.c 25 Oct 2005 01:07:53 - 1.23
@@ -27,9 +27,7 @@
int
main(int argc, char *argv[])
{
- char *spec_conf;
int note_count;
- int a;
/* IPC Check */
ecore_ipc_init();
===
RCS file: /cvsroot/enlightenment/misc/enotes/src/note.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- note.c 9 Oct 2005 12:11:48 - 1.53
+++ note.c 25 Oct 2005 01:07:53 - 1.54
@@ -35,7 +35,8 @@
}
void new_note_with_values(int x,int y,int width,int height,char *content){
- Note *p=new_note_with_values_return(x,y,width,height,content);
+ /*Note *p = */
+ new_note_with_values_return(x,y,width,height,content);
}
Note*
@@ -76,7 +77,6 @@
remove_note(Evas_List * note)
{
Note *p = evas_list_data(note);
- char *note_title;
dml("Closing a Note", 2);
@@ -627,7 +627,6 @@
int edje_w, edje_h;
Evas_List *working;
Note *note;
- int count = get_note_count();
char *edjefn = malloc(PATH_MAX);
===
RCS file: /cvsroot/enlightenment/misc/enotes/src/note.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- note.h 6 Apr 2005 13:06:43 - 1.22
+++ note.h 25 Oct 2005 01:07:53 - 1.23
@@ -20,13 +20,14 @@
#include
#include
+#include "../config.h"
#include "debug.h"
#include "config.h"
#include "controlcentre.h"
#include "saveload.h"
#include "ipc.h"
#include "menu.h"
-#include "../config.h"
+#include "msgbox.h"
#define NOTE_PART "Main"
===
RCS file: /cvsroot/enlightenment/misc/enotes/src/saveload.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- savel
E CVS: enotes vapier
Enlightenment CVS committal
Author : vapier
Project : misc
Module : enotes
Dir : misc/enotes
Modified Files:
configure.in
Removed Files:
acconfig.h
Log Message:
update autotool code
===
RCS file: /cvsroot/enlightenment/misc/enotes/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- configure.in13 Oct 2005 23:29:21 - 1.6
+++ configure.in25 Oct 2005 00:55:45 - 1.7
@@ -22,55 +22,52 @@
dnl Set PACKAGE_LOCALE_DIR in config.h.
if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR,
"${ac_default_prefix}/${DATADIRNAME}/locale")
+ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR,
"${ac_default_prefix}/${DATADIRNAME}/locale", [PACKAGE_LOCALE_DIR])
else
- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale")
+ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale",
[PACKAGE_LOCALE_DIR])
fi
dnl Set PACKAGE_DATA_DIR in config.h.
if test "x${datadir}" = 'x${prefix}/share'; then
if test "x${prefix}" = "xNONE"; then
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
"${ac_default_prefix}/share/${PACKAGE}")
+AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
"${ac_default_prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
else
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
+AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}",
[PACKAGE_DATA_DIR])
fi
else
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}",
[PACKAGE_DATA_DIR])
fi
dnl Set PACKAGE_BIN_DIR in config.h.
if test "x${datadir}" = 'x${prefix}/bin'; then
if test "x${prefix}" = "xNONE"; then
-AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin")
+AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin",
[PACKAGE_BIN_DIR])
else
-AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin")
+AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [PACKAGE_BIN_DIR])
fi
else
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}")
+ AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [PACKAGE_BIN_DIR])
fi
dnl Set PACKAGE_LIB_DIR in config.h.
if test "x${datadir}" = 'x${prefix}/lib'; then
if test "x${prefix}" = "xNONE"; then
-AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib")
+AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib",
[PACKAGE_LIB_DIR])
else
-AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib")
+AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [PACKAGE_LIB_DIR])
fi
else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}")
+ AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [PACKAGE_LIB_DIR])
fi
dnl Set PACKAGE_SOURCE_DIR in config.h.
packagesrcdir=`cd $srcdir && pwd`
-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
+AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}",
[PACKAGE_SOURCE_DIR])
PROG="ewl-config";
AC_PATH_PROG(EWL_CONFIG, $PROG, "", $PATH)
-if [ test -z $EWL_CONFIG ]; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- echo "FATAL ERROR. ABORT.";
- exit -1;
+if test -z "$EWL_CONFIG" ; then
+ AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
fi
ewl_cflags=`$EWL_CONFIG --cflags`
ewl_libs=`$EWL_CONFIG --libs`
@@ -79,11 +76,8 @@
PROG="evas-config";
AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH)
-if [ test -z $EVAS_CONFIG ]; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- echo "FATAL ERROR. ABORT.";
- exit -1;
+if test -z "$EVAS_CONFIG" ; then
+ AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
fi
evas_cflags=`$EVAS_CONFIG --cflags`
evas_libs=`$EVAS_CONFIG --libs`
@@ -92,11 +86,8 @@
PROG="ecore-config";
AC_PATH_PROG(ECORE_CONFIG, $PROG, "", $PATH)
-if [ test -z $ECORE_CONFIG ]; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- echo "FATAL ERROR. ABORT.";
- exit -1;
+if test -z "$ECORE_CONFIG" ; then
+ AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
fi
ecore_cflags=`$ECORE_CONFIG --cflags`
ecore_libs=`$ECORE_CONFIG --libs`
@@ -105,11 +96,8 @@
PROG="imlib2-config";
AC_PATH_PROG(IMLIB2_CONFIG, $PROG, "", $PATH)
-if [ test -z $IMLIB2_CONFIG ]; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- echo "FATAL ERROR. ABORT.";
- exit -1;
+if test -z "$IMLIB2_CONFIG" ; then
+ AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
fi
imlib2_cflags=`$IMLIB2_CONFIG --cflags`
imlib2_libs=`$IMLIB2_CONFIG --libs`
@@ -119,11 +107,8 @@
PROG="edje-config";
AC_P
E CVS: enotes vapier
Enlightenment CVS committal Author : vapier Project : misc Module : enotes Dir : misc/enotes Modified Files: autogen.sh Log Message: use simpler autogen script === RCS file: /cvsroot/enlightenment/misc/enotes/autogen.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- autogen.sh 27 Apr 2005 03:45:43 - 1.4 +++ autogen.sh 25 Oct 2005 00:51:03 - 1.5 @@ -1,13 +1,13 @@ #!/bin/sh rm -rf autom4te.cache -rm -f aclocal.m4 +rm -f aclocal.m4 ltmain.sh -echo "Running aclocal..."; aclocal $ACLOCAL_FLAGS -I m4 \ -&& echo "Running autoheader..."; autoheader \ -&& echo "Running autoconf..."; autoconf \ -&& echo "Running libtoolize..."; (libtoolize --automake || glibtoolize --automake) \ -&& echo "Running automake..."; automake --add-missing --copy --gnu +echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 +echo "Running autoheader..." ; autoheader || exit 1 +echo "Running autoconf..." ; autoconf || exit 1 +echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 +echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 if [ -z "$NOCONFIGURE" ]; then ./configure "$@" --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: enotes vapier
Enlightenment CVS committal Author : vapier Project : misc Module : enotes Dir : misc/enotes Modified Files: autogen.sh Log Message: more NOCONFIGURE support === RCS file: /cvsroot/enlightenment/misc/enotes/autogen.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- autogen.sh 5 Apr 2005 13:10:49 - 1.3 +++ autogen.sh 27 Apr 2005 03:45:43 - 1.4 @@ -9,5 +9,6 @@ && echo "Running libtoolize..."; (libtoolize --automake || glibtoolize --automake) \ && echo "Running automake..."; automake --add-missing --copy --gnu -### If you want this, uncomment it. -./configure "$@" +if [ -z "$NOCONFIGURE" ]; then + ./configure "$@" +fi --- SF.Net email is sponsored by: Tell us your software development plans! Take this survey and enter to win a one-year sub to SourceForge.net Plus IDC's 2005 look-ahead and a copy of this survey Click here to start! http://www.idcswdc.com/cgi-bin/survey?id=105hix ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
