X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=638a52b751135c79a62d0c37b70b7d98d2660da3;hb=0c56e138e63986d8a8c0d7fc3e2c7230a020289e;hp=193f34144e0bba48ccce1536e9aab44cdd98eebc;hpb=f95bc8309fe113855266f4445874248b6a285062;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 193f3414..638a52b7 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -77,28 +77,34 @@ lttlibdir="${libdir}/ltt"
 AC_SUBST(lttlibdir)
 
 
-top_includedir="\$(top_srcdir)/include"
-AC_SUBST(top_includedir)
+top_lttvdir="\$(top_srcdir)/lttv"
+AC_SUBST(top_lttvdir)
 
-DEFAULT_INCLUDES="-I\$(top_includedir) -I\$(top_srcdir)"
+top_guidir="\$(top_srcdir)/lttv/modules/gui"
+AC_SUBST(top_guidir)
+
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_lttvdir) -I\$(top_guidir)"
 AC_SUBST(DEFAULT_INCLUDES)
 
 #CPPFLAGS="${GLIB_CFLAGS}"
 #AC_SUBST(CPPFLAGS)
 
+lttincludedir="${includedir}/ltt"
+AC_SUBST(lttincludedir)
+
 lttvincludedir="${includedir}/lttv"
 AC_SUBST(lttvincludedir)
 
-lttincludedir="${includedir}/ltt"
-AC_SUBST(lttincludedir)
+lttvguiincludedir="${includedir}/lttvgui"
+AC_SUBST(lttvguiincludedir)
 
 AC_CONFIG_FILES([Makefile
 		 lttv/Makefile
-		 lttv/main/Makefile
+		 lttv/lttv/Makefile
 		 lttv/modules/Makefile
 		 lttv/modules/text/Makefile
 		 lttv/modules/gui/Makefile
-		 lttv/modules/gui/mainlib/Makefile
+		 lttv/modules/gui/lttvgui/Makefile
 		 lttv/modules/gui/main/Makefile
 		 lttv/modules/gui/main/src/Makefile
 		 lttv/modules/gui/main/pixmaps/Makefile
@@ -108,7 +114,5 @@ AC_CONFIG_FILES([Makefile
 		 lttv/modules/gui/statistics/Makefile
 		 lttd/Makefile
 		 ltt/Makefile
-		 include/Makefile
-		 ltt/convert/Makefile
-		 include/lttv/Makefile])
+		 ltt/convert/Makefile])
 AC_OUTPUT