[commit-gajim] r10275 - branches/osx_newbuildsys - Commits

24 Aug 2008

Author: js
Date: 2008-08-24 11:32:49 +0200 (Sun, 24 Aug 2008)
New Revision: 10275
Modified:
   branches/osx_newbuildsys/buildsys.mk.in
   branches/osx_newbuildsys/configure.ac
Log:
Oops, last commit was not complete. Sorry.
Modified: branches/osx_newbuildsys/buildsys.mk.in
===================================================================

--- branches/osx_newbuildsys/buildsys.mk.in	2008-08-24 09:32:18 UTC (rev 10274)
+++ branches/osx_newbuildsys/buildsys.mk.in	2008-08-24 09:32:49 UTC (rev 10275)
@@ -29,6 +29,7 @@
 OBJC = @OBJC@
 AR = @AR@
 LD = ${CC}
+PYTHON = @PYTHON@
 CFLAGS = @CFLAGS@
 CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@
@@ -36,6 +37,7 @@
 ERLCFLAGS = @ERLCFLAGS@
 OBJCFLAGS = @OBJCFLAGS@
 LDFLAGS = @LDFLAGS@
+PYTHON_FLAGS = @PYTHON_FLAGS@
 LIBS = @LIBS@
 PROG_IMPLIB_NEEDED = @PROG_IMPLIB_NEEDED@
 PROG_IMPLIB_LDFLAGS = @PROG_IMPLIB_LDFLAGS@
@@ -74,10 +76,11 @@
 OBJS4 = ${OBJS3:.d=.o}
 OBJS5 = ${OBJS4:.erl=.beam}
 OBJS6 = ${OBJS5:.m=.o}
-OBJS += ${OBJS6:.xpm=.o}
+OBJS7 = ${OBJS6:.py=.pyc}
+OBJS += ${OBJS7:.xpm=.o}
.SILENT:
-.SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m .xpm
+.SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m .py .pyc .xpm
 .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean
all:
@@ -205,6 +208,14 @@
    	${COMPILE_FAILED}; \
    fi
+.py.pyc:
+	${COMPILE_STATUS}
+	if ${PYTHON} ${PYTHON_FLAGS} -c "import py_compile; py_compile.compile('$<')"; then \
+		${COMPILE_OK}; \
+	else \
+		${COMPILE_FAILED}; \
+	fi
+
 .xpm.o:
    ${COMPILE_STATUS}
    if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
Modified: branches/osx_newbuildsys/configure.ac
===================================================================
--- branches/osx_newbuildsys/configure.ac	2008-08-24 09:32:18 UTC (rev 10274)
+++ branches/osx_newbuildsys/configure.ac	2008-08-24 09:32:49 UTC (rev 10275)
@@ -4,8 +4,6 @@
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_MACRO_DIR([m4])
-PKG_PROG_PKG_CONFIG([0.19])
-
 AC_ENABLE_SHARED(yes)
 AC_ENABLE_STATIC(no)
@@ -19,6 +17,7 @@
 AC_PATH_X
IT_PROG_INTLTOOL([0.35.0])
+PKG_PROG_PKG_CONFIG([0.19])
GETTEXT_PACKAGE=gajim
 AC_SUBST([GETTEXT_PACKAGE])
@@ -115,6 +114,7 @@
 if test "x$PYTHON" = "x:"; then
    AC_MSG_ERROR([Python not found])
 fi
+AC_SUBST(PYTHON_FLAGS, $PYTHON_FLAGS)
dnl ****
 dnl tray icon

    