[fusion-commits] Main plugins: Changes to 'master' (cd9dfd97dccc18208b1945486c7d81cdddcd41c5)

maniac at server.opencompositing.org maniac at server.opencompositing.org
Tue May 20 13:00:30 CEST 2008


New commits:
commit cd9dfd97dccc18208b1945486c7d81cdddcd41c5
Author: Danny Baumann <dannybaumann at web.de>
Date:   Tue May 20 13:00:06 2008 +0200

    Added staticswitcher to build system.
    Also sort file entries alphabetically.


 configure.ac                   |   11 +++++----
 metadata/Makefile.am           |   47 ++++++++++++++++++++-------------------
 po/Makefile.in.in              |    2 +-
 po/POTFILES.in                 |    9 ++++---
 src/Makefile.am                |   47 ++++++++++++++++++++-------------------
 src/staticswitcher/Makefile.am |   28 +++++++++++++++++++++++
 6 files changed, 88 insertions(+), 56 deletions(-)
 create mode 100644 src/staticswitcher/Makefile.am


Modified: fusion/plugins-main/configure.ac
===================================================================
--- fusion/plugins-main/configure.ac
+++ fusion/plugins-main/configure.ac
@@ -201,22 +201,23 @@ src/colorfilter/Makefile
 src/expo/Makefile
 src/ezoom/Makefile
 src/jpeg/Makefile
+src/mag/Makefile
+src/mousepoll/Makefile
 src/neg/Makefile
 src/opacify/Makefile
 src/put/Makefile
 src/resizeinfo/Makefile
 src/ring/Makefile
 src/scaleaddon/Makefile
+src/session/Makefile
+src/shift/Makefile
 src/snap/Makefile
+src/staticswitcher/Makefile
 src/text/Makefile
 src/thumbnail/Makefile
+src/vpswitch/Makefile
 src/wall/Makefile
 src/winrules/Makefile
 src/workarounds/Makefile
-src/vpswitch/Makefile
-src/shift/Makefile
-src/mousepoll/Makefile
-src/mag/Makefile
-src/session/Makefile
 po/Makefile.in
 ])

Modified: fusion/plugins-main/metadata/Makefile.am
===================================================================
--- fusion/plugins-main/metadata/Makefile.am
+++ fusion/plugins-main/metadata/Makefile.am
@@ -1,28 +1,29 @@
 xmldir       = $(metadatadir)
 xml_in_files = 	         \
-	animation.xml.in	 \
-	bs.xml.in \
-	colorfilter.xml.in \
-	expo.xml.in	 \
-	ezoom.xml.in	 \
-	imgjpeg.xml.in 	 \
-	neg.xml.in          \
-	opacify.xml.in      \
-	put.xml.in 	 \
-	resizeinfo.xml.in	 \
-	ring.xml.in	 \
-	snap.xml.in	 \
-	text.xml.in	 \
-	thumbnail.xml.in 	 \
-	wall.xml.in	 \
-	winrules.xml.in     \
-	workarounds.xml.in \
-	scaleaddon.xml.in   \
-	vpswitch.xml.in \
-	shift.xml.in \
-	mousepoll.xml.in \
-	mag.xml.in \
-	session.xml.in
+	animation.xml.in      \
+	bs.xml.in             \
+	colorfilter.xml.in    \
+	expo.xml.in           \
+	ezoom.xml.in          \
+	imgjpeg.xml.in        \
+	mag.xml.in            \
+	mousepoll.xml.in      \
+	neg.xml.in            \
+	opacify.xml.in        \
+	put.xml.in            \
+	resizeinfo.xml.in     \
+	ring.xml.in           \
+	scaleaddon.xml.in     \
+	session.xml.in        \
+	shift.xml.in          \
+	snap.xml.in           \
+	staticswitcher.xml.in \
+	text.xml.in           \
+	thumbnail.xml.in      \
+	vpswitch.xml.in       \
+	wall.xml.in           \
+	winrules.xml.in       \
+	workarounds.xml.in
 
 
 xml_files    = $(xml_in_files:.xml.in=.xml)

Modified: fusion/plugins-main/po/Makefile.in.in
===================================================================
--- fusion/plugins-main/po/Makefile.in.in
+++ fusion/plugins-main/po/Makefile.in.in
@@ -133,7 +133,7 @@ install-data-yes: all
 dvi info tags TAGS ID:
 
 # Define this as empty until I found a useful application.
-installcheck:
+install-exec installcheck:
 
 uninstall:
 	linguas="$(USE_LINGUAS)"; \

Modified: fusion/plugins-main/po/POTFILES.in
===================================================================
--- fusion/plugins-main/po/POTFILES.in
+++ fusion/plugins-main/po/POTFILES.in
@@ -1,23 +1,24 @@
 metadata/animation.xml.in
+metadata/bs.xml.in
 metadata/colorfilter.xml.in
 metadata/expo.xml.in
 metadata/ezoom.xml.in
 metadata/imgjpeg.xml.in
+metadata/mag.xml.in
+metadata/mousepoll.xml.in
 metadata/neg.xml.in
 metadata/opacify.xml.in
 metadata/put.xml.in
 metadata/resizeinfo.xml.in
 metadata/ring.xml.in
 metadata/scaleaddon.xml.in
+metadata/session.xml.in
 metadata/shift.xml.in
 metadata/snap.xml.in
+metadata/staticswitcher.xml.in
 metadata/text.xml.in
 metadata/thumbnail.xml.in
 metadata/vpswitch.xml.in
 metadata/wall.xml.in
 metadata/winrules.xml.in
 metadata/workarounds.xml.in
-metadata/mousepoll.xml.in
-metadata/mag.xml.in
-metadata/session.xml.in
-metadata/bs.xml.in

Modified: fusion/plugins-main/src/Makefile.am
===================================================================
--- fusion/plugins-main/src/Makefile.am
+++ fusion/plugins-main/src/Makefile.am
@@ -1,25 +1,26 @@
 ## Process this file with automake to produce Makefile.in
 SUBDIRS = \
-    animation    \
-    bs           \
-    colorfilter  \
-    expo         \
-    ezoom        \
-    jpeg         \
-    neg          \
-    opacify      \
-    put          \
-    resizeinfo   \
-    ring         \
-    scaleaddon   \
-    snap         \
-    text         \
-    thumbnail    \
-    wall         \
-    winrules     \
-    workarounds  \
-    vpswitch     \
-    shift        \
-    mousepoll    \
-    mag          \
-    session
+    animation      \
+    bs             \
+    colorfilter    \
+    expo           \
+    ezoom          \
+    jpeg           \
+    mag            \
+    mousepoll      \
+    neg            \
+    opacify        \
+    put            \
+    resizeinfo     \
+    ring           \
+    scaleaddon     \
+    session        \
+    shift          \
+    snap           \
+    staticswitcher \
+    text           \
+    thumbnail      \
+    vpswitch       \
+    wall           \
+    winrules       \
+    workarounds

Modified: fusion/plugins-main/src/staticswitcher/Makefile.am
new file mode 100644
===================================================================
--- /dev/null
+++ fusion/plugins-main/src/staticswitcher/Makefile.am
@@ -0,0 +1,28 @@
+## Process this file with automake to produce Makefile.in
+PFLAGS=-module -avoid-version -no-undefined
+
+libstaticswitcher_la_LDFLAGS = $(PFLAGS)
+libstaticswitcher_la_LIBADD = @COMPIZ_LIBS@
+libstaticswitcher_la_SOURCES = staticswitcher_options.c \
+			       staticswitcher_options.h \
+			       staticswitcher.c
+
+INCLUDES =                              \
+	-I$(top_srcdir)/include         \
+	@COMPIZ_CFLAGS@                  \
+	-DDATADIR='"$(compdatadir)"'        \
+	-DLIBDIR='"$(libdir)"'              \
+	-DLOCALEDIR="\"@datadir@/locale\""  \
+	-DIMAGEDIR='"$(imagedir)"'
+
+moduledir = $(plugindir)
+
+module_LTLIBRARIES = libstaticswitcher.la
+
+CLEANFILES = *_options.c *_options.h
+
+%_options.h: ../../metadata/%.xml
+		$(BCOP_BIN) --header $@ $<
+
+%_options.c: ../../metadata/%.xml %_options.h
+		$(BCOP_BIN) --source $@ $<


More information about the commits mailing list