Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3493 in orxonox.OLD


Ignore:
Timestamp:
Mar 11, 2005, 9:48:35 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: added new Makefile.am-structure, so it compiles again

Location:
orxonox/trunk
Files:
6 added
9 edited
1 moved

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/configure

    r3489 r3493  
    81828182## OUTPUT CONFIGURE ##
    81838183######################
    8184                                                   ac_config_files="$ac_config_files Makefile src/Makefile src/lib/graphics/importer/Makefile src/lib/gui/console/Makefile src/gui/Makefile"
     8184                                                                                ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/gui/Makefile src/lib/gui/console/Makefile src/lib/gui/gui/Makefile"
    81858185
    81868186
    … …  
    87788778  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    87798779  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     8780  "src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
     8781  "src/lib/graphics/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/graphics/Makefile" ;;
    87808782  "src/lib/graphics/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/graphics/importer/Makefile" ;;
     8783  "src/lib/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/Makefile" ;;
    87818784  "src/lib/gui/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/console/Makefile" ;;
    8782   "src/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gui/Makefile" ;;
     8785  "src/lib/gui/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/gui/Makefile" ;;
    87838786  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    87848787  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;

  • orxonox/trunk/configure.ac

    r3489 r3493  
    529529AC_CONFIG_FILES([Makefile
    530530                 src/Makefile
     531                 src/lib/Makefile
     532                 src/lib/graphics/Makefile
    531533                 src/lib/graphics/importer/Makefile
     534                 src/lib/gui/Makefile
    532535                 src/lib/gui/console/Makefile
    533                  src/gui/Makefile])
     536                 src/lib/gui/gui/Makefile])
    534537
    535538AC_OUTPUT

  • orxonox/trunk/src/Makefile.am

    r3491 r3493  
    6464                 game_loader.h \
    6565                 track_manager.h \
    66                  glincl.h \
    6766                 ability.h \
    6867                 camera.h \
    … …  
    8786                 network/synchronisable.h \
    8887                 defs/stdincl.h \
     88                 defs/glincl.h \
    8989                 defs/error.h \
    9090                 defs/debug.h \
    … …  
    108108EXTRA_DIST = orxonox.conf
    109109
    110 ### GTK_RELATED
    111 if HAVE_GTK2
    112   GTK_PROGS =console
    113 else
    114   GTK_PROGS =
    115 endif
    116110if SUB_PROJECTS
    117   SUB_PROGS = gui
    118 #             $(GTK_PROGS)
    119 ##lib/graphics/importer \
     111  SUB_PROGS = lib
    120112else
    121113  SUB_PROGS =

  • orxonox/trunk/src/Makefile.in

    r3491 r3493  
    106106ETAGS = etags
    107107CTAGS = ctags
    108 DIST_SUBDIRS = . gui
     108DIST_SUBDIRS = . lib
    109109DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    110110ACLOCAL = @ACLOCAL@
    … …  
    254254                 game_loader.h \
    255255                 track_manager.h \
    256                  glincl.h \
    257256                 ability.h \
    258257                 camera.h \
    … …  
    277276                 network/synchronisable.h \
    278277                 defs/stdincl.h \
     278                 defs/glincl.h \
    279279                 defs/error.h \
    280280                 defs/debug.h \
    … …  
    295295
    296296EXTRA_DIST = orxonox.conf
    297 @HAVE_GTK2_FALSE@GTK_PROGS =
    298 
    299 ### GTK_RELATED
    300 @HAVE_GTK2_TRUE@GTK_PROGS = console
    301 #             $(GTK_PROGS)
    302297@SUB_PROJECTS_FALSE@SUB_PROGS =
    303 @SUB_PROJECTS_TRUE@SUB_PROGS = gui
     298@SUB_PROJECTS_TRUE@SUB_PROGS = lib
    304299SUBDIRS = . \
    305300          $(SUB_PROGS)
    … …  
    318313          esac; \
    319314        done; \
    320         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
     315        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
    321316        cd $(top_srcdir) && \
    322           $(AUTOMAKE) --foreign  src/Makefile
     317          $(AUTOMAKE) --gnu  src/Makefile
    323318.PRECIOUS: Makefile
    324319Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/graphics/importer/Makefile.in

    r3487 r3493  
    215215          esac; \
    216216        done; \
    217         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
     217        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
    218218        cd $(top_srcdir) && \
    219           $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
     219          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
    220220.PRECIOUS: Makefile
    221221Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/gui/console/Makefile.in

    r3489 r3493  
    203203          esac; \
    204204        done; \
    205         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile'; \
     205        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile'; \
    206206        cd $(top_srcdir) && \
    207           $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile
     207          $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile
    208208.PRECIOUS: Makefile
    209209Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/gui/gui/Makefile.am

    r3423 r3493  
     1MAINSRCDIR=../../..
    12AM_CXXFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     3AM_CXXFLAGS+=-I$(MAINSRCDIR)
     4AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities
     5AM_CXXFLAGS+=-I$(MAINSRCDIR)/story_entities
     6AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib
     7AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/coord
     8AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
     9AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
     10AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/font
     11AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
     12AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
     13AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
     14AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
     15AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
     16AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
     17AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
     18AM_CXXFLAGS+=-I$(MAINSRCDIR)/network
     19AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu
     20AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
     21
    222#AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
    323LIBS=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)

  • orxonox/trunk/src/lib/gui/gui/Makefile.in

    r3484 r3493  
    2424pkglibdir = $(libdir)/@PACKAGE@
    2525pkgincludedir = $(includedir)/@PACKAGE@
    26 top_builddir = ../..
     26top_builddir = ../../../..
    2727am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    2828INSTALL = @INSTALL@
    … …  
    4040host_triplet = @host@
    4141bin_PROGRAMS = gui$(EXEEXT)
    42 subdir = src/gui
     42subdir = src/lib/gui/gui
    4343DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    4444        $(srcdir)/Makefile.in
    … …  
    129129LDFLAGS = @LDFLAGS@
    130130LIBOBJS = @LIBOBJS@
     131
    131132#AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
    132133LIBS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    … …  
    190191target_os = @target_os@
    191192target_vendor = @target_vendor@
    192 AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     193MAINSRCDIR = ../../..
     194AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/font -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
    193195gui_SOURCES = orxonox_gui.cc \
    194196            orxonox_gui_gtk.cc \
    … …  
    234236          esac; \
    235237        done; \
    236         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/gui/Makefile'; \
     238        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile'; \
    237239        cd $(top_srcdir) && \
    238           $(AUTOMAKE) --foreign  src/gui/Makefile
     240          $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile
    239241.PRECIOUS: Makefile
    240242Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/gui/gui/orxonox_gui_gtk.h

    r3423 r3493  
    1313extern int verbose; // soon obsolete here
    1414
    15 #include "../debug.h"
     15#include "debug.h"
    1616
    1717#ifdef HAVE_GTK2
Note: See TracChangeset for help on using the changeset viewer.