Changeset 1952 in orxonox.OLD

Timestamp:

Jun 15, 2004, 2:59:30 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/automake: console now compiles

Location:

orxonox/branches/automake/console

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)

orxonox/branches/automake/console/Makefile.am

@@ -1 @@
-#AM_CFLAGS="-I FUCK_YOU"
-#`pkg-config --cflags gtk+-2.0`
-#AM_LDFLAGS="test"
-CFLAGS="-I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include"
-#`pkg-config --libs  gtk+-2.0`
+AM_CXXFLAGS=`pkg-config --cflags gtk+-2.0`
+AM_LDFLAGS=`pkg-config --libs  gtk+-2.0`
 
 bin_PROGRAMS=console

orxonox/branches/automake/console/Makefile.in

@@ -46 +46 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-
-#AM_CFLAGS="-I FUCK_YOU"
-#`pkg-config --cflags gtk+-2.0`
-#AM_LDFLAGS="test"
-CFLAGS = "-I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include"
+CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -114 +110 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
-#`pkg-config --libs  gtk+-2.0`
+AM_CXXFLAGS = `pkg-config --cflags gtk+-2.0`
+AM_LDFLAGS = `pkg-config --libs  gtk+-2.0`
+
 bin_PROGRAMS = console
 console_SOURCES = orxonox_console.cc orxonox_console_entry.cc orxonox_console_log.cc