X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2FMakefile.am;h=4eb2186b428442bd4591b0874dc0c626c5d1792b;hb=9c5b887cee5a8100332e7e992df34a573066b917;hp=9b4f9512f6229cf7aaeae3f9198ee01858482a9e;hpb=7682d14e5fb3d28285511aaa3bf6219609dfd315;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/Makefile.am b/synfig-studio/trunk/src/gtkmm/Makefile.am
index 9b4f951..4eb2186 100644
--- a/synfig-studio/trunk/src/gtkmm/Makefile.am
+++ b/synfig-studio/trunk/src/gtkmm/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-EXTRADIST = compview.cpp
+EXTRA_DIST = compview.cpp
 MAINTAINERCLEANFILES = Makefile.in $(GLADE_FILES)
 
 CELLRENDERER_HH = \
@@ -55,11 +55,11 @@ WIDGET_CC = \
 STATE_HH = \
 	state_bline.h	state_circle.h	 state_draw.h	state_eyedrop.h	  state_fill.h	 state_gradient.h		\
 	state_normal.h	 state_polygon.h   state_rectangle.h   state_rotate.h	state_scale.h	state_sketch.h		\
-	state_smoothmove.h   state_stroke.h   state_width.h   state_zoom.h
+	state_smoothmove.h   state_star.h   state_stroke.h   state_text.h   state_width.h   state_zoom.h
 STATE_CC = \
 	state_bline.cpp state_circle.cpp state_draw.cpp state_eyedrop.cpp state_fill.cpp state_gradient.cpp		\
 	state_normal.cpp state_polygon.cpp state_rectangle.cpp state_rotate.cpp state_scale.cpp state_sketch.cpp	\
-	state_smoothmove.cpp state_stroke.cpp state_width.cpp state_zoom.cpp
+	state_smoothmove.cpp state_star.cpp state_stroke.cpp state_text.cpp state_width.cpp state_zoom.cpp
 
 TREEVIEW_HH = \
 	childrentree.h	 keyframetree.h	  layergrouptree.h   layertree.h
@@ -87,14 +87,14 @@ ACTION_MANAGERS_CC = \
 
 OTHER_HH = compview.h eventkey.h smach.h \
 	about.h	  adjust_window.h   app.h   asyncrenderer.h   audiocontainer.h	 autorecover.h	 canvasoptions.h	\
-	canvasproperties.h   canvasview.h   devicetracker.h   dialogsettings.h	 duckmatic.h   iconcontroller.h		\
-	instance.h   ipc.h   keymapsettings.h	module.h   onemoment.h	 preview.h   renddesc.h	  render.h		\
-	statemanager.h	 toolbox.h   valuelink.h   workarea.h	zoomdial.h						\
+	canvasproperties.h   canvasview.h   devicetracker.h   dialogsettings.h	 duckmatic.h   general.h                \
+	iconcontroller.h instance.h   ipc.h   keymapsettings.h	module.h onemoment.h preview.h   renddesc.h             \
+	render.h splash.h statemanager.h toolbox.h valuelink.h workarea.h zoomdial.h
 OTHER_CC = main.cpp \
 	about.cpp adjust_window.cpp app.cpp asyncrenderer.cpp audiocontainer.cpp autorecover.cpp canvasoptions.cpp	\
 	canvasproperties.cpp canvasview.cpp devicetracker.cpp dialogsettings.cpp duckmatic.cpp iconcontroller.cpp	\
 	instance.cpp ipc.cpp keymapsettings.cpp module.cpp onemoment.cpp preview.cpp renddesc.cpp render.cpp		\
-	statemanager.cpp toolbox.cpp valuelink.cpp workarea.cpp zoomdial.cpp
+	splash.cpp statemanager.cpp toolbox.cpp valuelink.cpp workarea.cpp zoomdial.cpp
 
 INCLUDES = -I$(top_srcdir)/src
 
@@ -106,6 +106,6 @@ synfigstudio_SOURCES = \
 	$(STATE_CC) $(STATE_HH) $(WIDGET_CC) $(WIDGET_HH) $(CELLRENDERER_HH) $(CELLRENDERER_CC)				\
 	$(DIALOG_HH) $(DIALOG_CC)
 
-synfigstudio_LDADD = -L../synfigapp -lsynfigapp @SYNFIG_LIBS@ @GTKMM_LIBS@ @FMOD_LIBS@
+synfigstudio_LDADD = ../synfigapp/libsynfigapp.la @SYNFIG_LIBS@ @GTKMM_LIBS@ @FMOD_LIBS@
 synfigstudio_LDFLAGS = -dlopen self
 synfigstudio_CXXFLAGS = @SYNFIG_CFLAGS@ @GTKMM_CFLAGS@ -DIMAGE_DIR=\"$(imagedir)\" -DIMAGE_EXT=\"$(imageext)\" "-DLOCALEDIR=\"$(localedir)\""