src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 8ad0e08..5be348d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,147 +1,42 @@
 
  
-if HAVE_LIBVALA22
-builder_LIBVALA = --pkg libvala-0.22
-endif
- 
-if HAVE_LIBVALA24
-builder_LIBVALA = --pkg libvala-0.24
-endif
-
-
-if HAVE_LIBVALA26
-builder_LIBVALA = --pkg libvala-0.26
-endif
-
-if HAVE_LIBVALA28
-builder_LIBVALA = --pkg libvala-0.28
-endif
-
-# gda
-
-
-if HAVE_GDA5
-builder_GDA = --pkg libgda-5.0
-endif
-
-if HAVE_GDA4
-builder_GDA = --pkg libgda-4.0
-endif
-
-
-# webkit
-
-
-if HAVE_WEBKIT4
-builder_WEBKKIT =   --pkg  webkit2gtk-4.0  
-endif
-
-if HAVE_WEBKIT3
-builder_WEBKKIT =   --pkg  webkit2gtk-3.0  
-endif
-
-# vte
- 
-if HAVE_VTE_2_91
-builder_VTE =   --pkg  vte-2.91  
-endif
-if HAVE_VTE_2_90
-builder_VTE =   --pkg  vte-2.90  
-endif
  
 # - not sure if needed....  
+# did have  $(JAVASCRIPTCOREGTK_CFLAGS)
+AM_CPPFLAGS =  $(ROOJSPACKER_CFLAGS) 
 
-AM_CPPFLAGS =  $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(GDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS) $(VTE_CFLAGS)
 
-
-bin_PROGRAMS = builder4
+bin_PROGRAMS = roojspacker
 
  
-builder4_PKGS = \
+roojspacker_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 \
                --pkg gee-1.0 \
-               --pkg gobject-introspection-1.0 \
-               --pkg clutter-gtk-1.0 \
-               --pkg gladeui-2.0 \
-               --pkg libsoup-2.4 \
-               --pkg javascriptcore \
-               $(builder_LIBVALA) \
-               $(builder_GDA) \
-               $(builder_WEBKKIT) \
-               $(builder_JAVASCRIPTCOREGTK) \
-               $(builder_VTE) \
                --pkg posix 
 
 
-builder4_SOURCES = \
-               Application.vala \
-               Main.vala \
-               Spawn.vala \
-               JsRender/Gtk.vala \
-               JsRender/PlainFile.vala \
-               JsRender/JsRender.vala \
-               JsRender/Lang.vala \
-               JsRender/NodeToGlade.vala \
-               JsRender/NodeToGtk.vala \
-               JsRender/NodeToJs.vala \
-               JsRender/NodeToVala.vala \
-               JsRender/Node.vala \
-               JsRender/Roo.vala \
-               Project/Gtk.vala \
-               Project/Project.vala \
-               Project/Roo.vala \
-               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 \
-               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/ProjectSettings.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/ValaProjectSettings.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 \
-               Resources.vala 
+roojspacker_SOURCES = \
+               jsdoc/Collapse.vala \
+               jsdoc/CompressWhite.vala \
+               jsdoc/Identifier.vala \
+               jsdoc/Lang.vala \
+               jsdoc/PackerRun.vala \
+               jsdoc/Packer.vala \
+               jsdoc/ScopeParser.vala \
+               jsdoc/Scope.vala \
+               jsdoc/TextStream.vala \
+               jsdoc/TokenReader.vala \
+               jsdoc/TokenStream.vala \
+               jsdoc/Token.vala
+
                
                
  
-builder4_VALAFLAGS = \
-        --thread -X -lm --target-glib=2.32 --vapidir=$(srcdir)/vapi -g  $(builder4_PKGS)
+roojspacker_VALAFLAGS = \
+        --thread -X -lm --target-glib=2.32 --vapidir=$(srcdir)/vapi -g  $(roojspacker_PKGS)
 
-builder4_LDADD =  $(BUILDER_LIBS) $(LIBVALA_LIBS) $(GDA_LIBS) $(WEBKIT_LIBS) $(VTE_LIBS) $(JAVASCRIPTCOREGTK_LIBS)
+roojspacker_LDADD =  $(ROOJSPACKER_LIBS)