Author: js
Date: 2008-09-04 13:19:48 +0200 (Thu, 04 Sep 2008)
New Revision: 10386
Added:
branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/Makefile
Modified:
branches/osx_newbuildsys/configure.ac
branches/osx_newbuildsys/src/Makefile
branches/osx_newbuildsys/src/common/Makefile
branches/osx_newbuildsys/src/common/xmpp/Makefile
branches/osx_newbuildsys/src/common/zeroconf/Makefile
branches/osx_newbuildsys/src/osx/Makefile
branches/osx_newbuildsys/src/osx/growl/Makefile
branches/osx_newbuildsys/src/osx/growl/growlImage_m/Makefile
branches/osx_newbuildsys/src/osx/growl/growl_c/Makefile
branches/osx_newbuildsys/src/osx/idle_c/Makefile
branches/osx_newbuildsys/src/osx/nsapp_m/Makefile
branches/osx_newbuildsys/src/osx/syncmenu/Makefile
branches/osx_newbuildsys/src/spellmodule/Makefile
branches/osx_newbuildsys/src/traymodule/Makefile
Log:
Install files in src to the same location as with the old buildsys.
This needs to be discussed, though, as installing executable files to
$datadir is wrong.
Modified: branches/osx_newbuildsys/configure.ac
===================================================================
--- branches/osx_newbuildsys/configure.ac 2008-09-04 07:26:45 UTC (rev 10385)
+++ branches/osx_newbuildsys/configure.ac 2008-09-04 11:19:48 UTC (rev 10386)
@@ -204,7 +204,7 @@
AS_AC_EXPAND(DOCDIR, "${docdir}")
AC_SUBST(VERSION)
-AC_SUBST(PACKAGE)
+AC_SUBST(PACKAGE, gajim)
AC_SUBST(DATADIR)
AC_SUBST(LIBDIR)
AS_AC_EXPAND(DATADIR, "${DATADIR}")
Modified: branches/osx_newbuildsys/src/Makefile
===================================================================
--- branches/osx_newbuildsys/src/Makefile 2008-09-04 07:26:45 UTC (rev 10385)
+++ branches/osx_newbuildsys/src/Makefile 2008-09-04 11:19:48 UTC (rev 10386)
@@ -1,4 +1,3 @@
-# FIXME: Install files
include ../extra.mk
SUBDIRS = common ${TRAYMODULE} ${SPELLMODULE} osx
@@ -49,6 +48,9 @@
include ../buildsys.mk
+PACKAGE := ${PACKAGE}/src
+DATA = ${OBJS}
+
all: ${OBJS} gtkspell.so trayicon.so
# Don't depend on the actual file, we can create the symlink anyway
Modified: branches/osx_newbuildsys/src/common/Makefile
===================================================================
--- branches/osx_newbuildsys/src/common/Makefile 2008-09-04 07:26:45 UTC (rev 10385)
+++ branches/osx_newbuildsys/src/common/Makefile 2008-09-04 11:19:48 UTC (rev 10386)
@@ -1,4 +1,3 @@
-# FIXME: Install files
include ../../extra.mk
SUBDIRS = xmpp zeroconf ${IDLEMODULE}
@@ -41,6 +40,9 @@
include ../../buildsys.mk
+PACKAGE := ${PACKAGE}/src/common
+DATA = ${OBJS}
+
all: ${OBJS} idle.so
# Don't depend on the actual file, we can create the symlink anyway
Modified: branches/osx_newbuildsys/src/common/xmpp/Makefile
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/Makefile 2008-09-04 07:26:45 UTC (rev 10385)
+++ branches/osx_newbuildsys/src/common/xmpp/Makefile 2008-09-04 11:19:48 UTC (rev 10386)
@@ -1,5 +1,3 @@
-# FIXME: Install files
-
SRCS = __init__.py \
auth.py \
auth_nb.py \
@@ -25,4 +23,7 @@
include ../../../buildsys.mk
+PACKAGE := ${PACKAGE}/src/common/xmpp
+DATA = ${OBJS}
+
all: ${OBJS}
Modified: branches/osx_newbuildsys/src/common/zeroconf/Makefile
===================================================================
--- branches/osx_newbuildsys/src/common/zeroconf/Makefile 2008-09-04 07:26:45 UTC (rev 10385)
+++ branches/osx_newbuildsys/src/common/zeroconf/Makefile 2008-09-04 11:19:48 UTC (rev 10386)
@@ -1,5 +1,3 @@
-# FIXME: Install files
-
SRCS = __init__.py \
client_zeroconf.py \
connection_handlers_zeroconf.py \
@@ -11,4 +9,7 @@
include ../../../buildsys.mk
+PACKAGE := ${PACKAGE}/src/common/zeroconf
+DATA = ${OBJS}
+
all: ${OBJS}
Modified: branches/osx_newbuildsys/src/osx/Makefile
===================================================================
--- branches/osx_newbuildsys/src/osx/Makefile 2008-09-04 07:26:45 UTC (rev 10385)
+++ branches/osx_newbuildsys/src/osx/Makefile 2008-09-04 11:19:48 UTC (rev 10386)
@@ -1,4 +1,3 @@
-# FIXME: Install files
include ../../extra.mk
SUBDIRS = ${OSX_IDLEMODULE} ${OSX_MODULES}
@@ -11,6 +10,9 @@
include ../../buildsys.mk
+PACKAGE := ${PACKAGE}/src/osx
+DATA = ${OBJS}
+
all: ${OBJS} idle.so nsapp.so
# Don't depend on the actual file, we can create the symlink anyway
Modified: branches/osx_newbuildsys/src/osx/growl/Makefile
===================================================================
--- branches/osx_newbuildsys/src/osx/growl/Makefile 2008-09-04 07:26:45 UTC (rev 10385)
+++ branches/osx_newbuildsys/src/osx/growl/Makefile 2008-09-04 11:19:48 UTC (rev 10386)
@@ -1,5 +1,3 @@
-# FIXME: Install files
-
SUBDIRS = growl_c growlImage_m
SRCS = Growl.py \
@@ -8,6 +6,9 @@
include ../../../buildsys.mk
+PACKAGE := ${PACKAGE}/osx/growl
+DATA = ${OBJS}
+
all: ${OBJS} _growl.so _growlImage.so
# Don't depend on the actual file, we can create the symlink anyway
Modified: branches/osx_newbuildsys/src/osx/growl/growlImage_m/Makefile
===================================================================
--- branches/osx_newbuildsys/src/osx/growl/growlImage_m/Makefile 2008-09-04 07:26:45 UTC (rev 10385)
+++ branches/osx_newbuildsys/src/osx/growl/growlImage_m/Makefile 2008-09-04 11:19:48 UTC (rev 10386)
@@ -1,5 +1,3 @@
-# FIXME: Install files
-
# Python calls these .so, even on OS X, which is very wrong. It should be .impl!
PLUGIN = _growlImage.so
SRCS = _growlImage.m
Modified: branches/osx_newbuildsys/src/osx/growl/growl_c/Makefile
===================================================================
--- branches/osx_newbuildsys/src/osx/growl/growl_c/Makefile 2008-09-04 07:26:45 UTC (rev 10385)
+++ branches/osx_newbuildsys/src/osx/growl/growl_c/Makefile 2008-09-04 11:19:48 UTC (rev 10386)
@@ -1,5 +1,3 @@
-# FIXME: Install files
-
# Python calls these .so, even on OS X, which is very wrong. It should be .impl!
PLUGIN = _growl.so
SRCS = _growl.c
Modified: branches/osx_newbuildsys/src/osx/idle_c/Makefile
===================================================================
--- branches/osx_newbuildsys/src/osx/idle_c/Makefile 2008-09-04 07:26:45 UTC (rev 10385)
+++ branches/osx_newbuildsys/src/osx/idle_c/Makefile 2008-09-04 11:19:48 UTC (rev 10386)
@@ -1,5 +1,3 @@
-# FIXME: Install files
-
# Python calls these .so, even on OS X, which is very wrong. It should be .impl!
PLUGIN = idle.so
SRCS = idle.c
Modified: branches/osx_newbuildsys/src/osx/nsapp_m/Makefile
===================================================================
--- branches/osx_newbuildsys/src/osx/nsapp_m/Makefile 2008-09-04 07:26:45 UTC (rev 10385)
+++ branches/osx_newbuildsys/src/osx/nsapp_m/Makefile 2008-09-04 11:19:48 UTC (rev 10386)
@@ -1,5 +1,3 @@
-# FIXME: Install files
-
# Python calls these .so, even on OS X, which is very wrong. It should be .impl!
PLUGIN = nsapp.so
SRCS = nsapp.m
Modified: branches/osx_newbuildsys/src/osx/syncmenu/Makefile
===================================================================
--- branches/osx_newbuildsys/src/osx/syncmenu/Makefile 2008-09-04 07:26:45 UTC (rev 10385)
+++ branches/osx_newbuildsys/src/osx/syncmenu/Makefile 2008-09-04 11:19:48 UTC (rev 10386)
@@ -1,5 +1,3 @@
-# FIXME: Install files
-
SUBDIRS = syncmenu
SRCS = test-menu.py
@@ -7,6 +5,9 @@
include ../../../buildsys.mk
+PACKAGE := ${PACKAGE}/src/osx/syncmenu
+DATA = ${OBJS}
+
all: ${OBJS} syncmenu.so
# Don't depend on the actual file, we can create the symlink anyway
Added: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/Makefile
===================================================================
--- branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/Makefile (rev 0)
+++ branches/osx_newbuildsys/src/osx/syncmenu/syncmenu/Makefile 2008-09-04 11:19:48 UTC (rev 10386)
@@ -0,0 +1,12 @@
+# Python calls these .so, even on OS X, which is very wrong. It should be .impl!
+PLUGIN = syncmenu.so
+SRCS = pysyncmenu.c \
+ sync-menu.c
+
+include ../../../../buildsys.mk
+include ../../../../extra.mk
+
+# FIXME: This should be done properly...
+CFLAGS += ${PLUGIN_CFLAGS} ${PYTHON_CFLAGS} $$(pkg-config --cflags gtk+-2.0 pygobject-2.0)
+LIBS += ${PYTHON_LIBS} ${PYGTK_LIBS} $$(pkg-config --libs gtk+-2.0 pygobject-2.0)
+LDFLAGS += ${PLUGIN_LDFLAGS} ${PYTHON_LDFLAGS} -framework CoreFoundation
Modified: branches/osx_newbuildsys/src/spellmodule/Makefile
===================================================================
--- branches/osx_newbuildsys/src/spellmodule/Makefile 2008-09-04 07:26:45 UTC (rev 10385)
+++ branches/osx_newbuildsys/src/spellmodule/Makefile 2008-09-04 11:19:48 UTC (rev 10386)
@@ -1,5 +1,3 @@
-# FIXME: Install files
-
# Python calls these .so, even on OS X, which is very wrong. It should be .impl!
PLUGIN = gtkspell.so
SRCS = gtkspellmodule.c
Modified: branches/osx_newbuildsys/src/traymodule/Makefile
===================================================================
--- branches/osx_newbuildsys/src/traymodule/Makefile 2008-09-04 07:26:45 UTC (rev 10385)
+++ branches/osx_newbuildsys/src/traymodule/Makefile 2008-09-04 11:19:48 UTC (rev 10386)
@@ -1,5 +1,3 @@
-# FIXME: Install files
-
# Python calls these .so, even on OS X, which is very wrong. It should be .impl!
PLUGIN = trayicon.so
SRCS = eggtrayicon.c \