Changed MergeBranch.bjsMergeBranch.vala

[gitlive] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 39664e9..3556ac9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,108 +6,50 @@ AM_CPPFLAGS =  $(GITLIVE_CFLAGS)
 bin_PROGRAMS = Gitlive
 
  
-roobuilder_PKGS = \
-               --pkg glib-2.0  \
-               --pkg gobject-2.0  \
-               --pkg  gtk+-3.0 \
-               --pkg  gtksourceview-3.0 \
-               --pkg  libxml-2.0 \
-               --pkg json-glib-1.0 \
+Gitlive_PKGS = \
+               --pkg gio-2.0  \
+               --pkg posix  \
+               --pkg gtk+-3.0 \
+               --pkg libnotify \
+               --pkg  libwnck-3.0 \
                --pkg gee-0.8 \
-               --pkg gobject-introspection-1.0 \
-               --pkg clutter-gtk-1.0 \ 
+               --pkg libcanberra \
                --pkg libsoup-2.4 \
-               --pkg javascriptcore \
-               --pkg roojspacker-1.1 \
-               $(roobuilder_LIBVALA) \
-               $(roobuilder_GDA) \
-               $(roobuilder_WEBKKIT) \
-               $(roobuilder_JAVASCRIPTCOREGTK) \
-               $(roobuilder_VTE) \
-               --pkg posix 
-
-
-BUIDERJSRENDER = \
-               JsRender/Gtk.vala \
-               JsRender/PlainFile.vala \
-               JsRender/JsRender.vala \
-               JsRender/Lang.vala \
-               JsRender/NodeToGtk.vala \
-               JsRender/NodeToJs.vala \
-               JsRender/NodeToVala.vala \
-               JsRender/Node.vala \
-               JsRender/Roo.vala 
-
-
-
-BUIDERPALETE = \
-               Palete/Gir.vala \
-               Palete/GirObject.vala \
-               Palete/VapiParser.vala \
-               Palete/Gtk.vala \
-               Palete/RooDatabase.vala \
-               c/jscore_object_call_as_function.c \
-               Palete/Javascript.vala \
-               Palete/Palete.vala \
-               Palete/Roo.vala \
-               Palete/ValaSource.vala \
-               Palete/ValaSourceCompiler.vala \
-               Palete/CompletionProvider.vala
-        
-BUIDERPROJECT = \
-               Project/Gtk.vala \
-               Project/Project.vala \
-               Project/Roo.vala 
-
+               --pkg json-glib-1.0 \
+               --pkg  gtksourceview-3.0
+
+Gitlive_SOURCES = \
+          Gitlive.vala \
+          Monitor.vala \
+          GitMonitor.vala \
+          GitMonitorQueue.vala \
+          Spawn.vala \
+          StatusIcon.vala \
+          GitRepo.vala \
+          GitBranch.vala \
+          RooTicket.vala \
+          c/xorg_idletime.c \
+          WindowLog.vala \
+          Clones.vala \
+          Clone.vala \
+          Ticket.vala \
+          NewBranch.vala \
+          MergeBranch.vala \
+          RepoStatusPopover.vala
+
+          
 
-BUIDERUI = \
-               Builder4/About.vala \
-               Builder4/DialogConfirm.vala \
-               Builder4/StandardErrorDialog.vala \
-               Builder4/DialogSaveTemplate.vala \
-               Builder4/DialogSaveModule.vala \
-               Builder4/DialogTemplateSelect.vala \
-               Builder4/EditProject.vala \
-               Builder4/Editor.vala \
-               Builder4/RooProjectSettings.vala \
-               Builder4/WindowRightPalete.vala \
-               Builder4/WindowLeftTree.vala \
-               Builder4/WindowRooView.vala \
-               Builder4/WindowLeftProps.vala \
-               Builder4/ClutterFiles.vala \
-               Builder4/WindowLeftProjects.vala \
-               Builder4/WindowAddProp.vala \
-               Builder4/GtkView.vala \
-               Builder4/ValaProjectSettingsPopover.vala \
-               Builder4/MainWindow.vala \
-               Builder4/WindowState.vala \
-               Builder4/FakeServer.vala \
-               Builder4/DialogPluginWebkit.vala \
-               Builder4/DialogNewComponent.vala \
-               Builder4/PopoverFileDetails.vala \
-               Builder4/ValaCompileErrors.vala \
-               Builder4/ValaCompileResults.vala \
-               Builder4/PopoverProperty.vala
-        
-roobuilder_SOURCES = \
-               Application.vala \
-               Main.vala \
-               Spawn.vala \
-               Resources.vala  \
-               $(BUIDERJSRENDER) \
-               $(BUIDERPALETE) \
-               $(BUIDERPROJECT) \
-               $(BUIDERUI) 
 
                
-               
-               
-               
- 
-roobuilder_VALAFLAGS = \
-        --thread -X -lm --target-glib=2.32 --vapidir=$(srcdir)/vapi -g  $(roobuilder_PKGS)
+Gitlive_VALAFLAGS = \
+      --Xcc=-lXss \
+      --Xcc=-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
+         --thread -X -lm --target-glib=2.32 -g  $(Gitlive_PKGS) -X -O0
+
+Gitlive_CFLAGS = \
+        -DWNCK_I_KNOW_THIS_IS_UNSTABLE  -lXss -lm -lX11 $(XSCRNSAVER_CFLAGS) -O0
 
-roobuilder_LDADD =  $(ROOBUILDER_LIBS) $(LIBVALA_LIBS) $(GDA_LIBS) $(WEBKIT_LIBS) $(VTE_LIBS) $(JAVASCRIPTCOREGTK_LIBS)
+Gitlive_LDADD =  $(GITLIVE_LIBS) $(XSCRNSAVER_LIBS) -lX11