First go at using Gtk3. Everything builds but there is stuff (Pango modules) missing...

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 676d437..bf49796 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,7 +52,7 @@ src_moonshot_webp_SOURCES = \
         src/moonshot-webp-parser.vala \
         src/moonshot-id.vala
 
-src_moonshot_VALAFLAGS = --pkg gdk-2.0 --pkg gtk+-2.0 --pkg gee-1.0 $(AM_VALAFLAGS)
+src_moonshot_VALAFLAGS =--pkg gee-1.0 $(AM_VALAFLAGS)
 src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
 src_moonshot_LDADD = $(moonshot_LIBS)
 
@@ -68,7 +68,7 @@ src_moonshot_CFLAGS = -mwindows
 src_moonshot_webp_CFLAGS = -mwindows
     
 AM_CPPFLAGS += -DOS_WIN32
-AM_VALAFLAGS += --define=OS_WIN32
+AM_VALAFLAGS += --define=OS_WIN32 --pkg gdk-2.0 --pkg gtk+-2.0 
 
 noinst_DATA = libmoonshot/libmoonshot.lib
 
@@ -82,12 +82,14 @@ endif
 if  OS_MACOS
 
 AM_CPPFLAGS += -DOS_MACOS
-AM_VALAFLAGS += --define=OS_MACOS
+AM_VALAFLAGS += --define=OS_MACOS --pkg gdk-3.0 --pkg gtk+-3.0 
 
 endif
 
 if OS_LINUX
 
+AM_VALAFLAGS += --define=OS_MACOS --pkg gdk-2.0 --pkg gtk+-2.0 
+
 ## Installing mime type data
 mimedir = $(datadir)/mime/packages
 mime_DATA = webprovisioning/moonshot.xml
@@ -240,23 +242,5 @@ app-bundle:
 
 installerdir = $(HOME)/moonshot/mac-client-installer
 
-installer:
-       cd $(installerdir) && pwd
-
-# fix up the cyrus-sasl links
-       cd $(installerdir) && mkdir -p sasl/usr/lib
-       cd $(installerdir)/sasl/usr/lib && ln -fs   ../local/lib/sasl2 
-       cd $(installerdir) && mkdir -p resources
-
-# Ensure the permissions are correct for the files to be installed
-
-       cd $(installerdir) && sudo chown -R root:admin sasl
-       cd $(installerdir) && sudo chmod -R g+w sasl
-
-# create the installer package
-       cd $(installerdir) && /Developer/usr/bin/packagemaker --doc Moonshot\ Client\ Software.pmdoc \
-      --version 0.1 --filter "/.DS_Store" --resources ./resources/ --root-volume-only\
-      --domain system --verbose --no-relocate -l "/" --target 10.5 \
-      --id ja.net.moonshotClientSoftware  --out Moonshot\ Client\ Software.pkg
        
 endif