Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2589 in orxonox.OLD for orxonox


Ignore:
Timestamp:
Oct 17, 2004, 9:18:28 PM (21 years ago)
Author:
bensch
Message:

orxonox/trunk: Makefile.am's updated. They now include header files as they should

Location:
orxonox/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/console/Makefile.am

    r2019 r2589  
    33
    44bin_PROGRAMS=console
    5 console_SOURCES=orxonox_console.cc orxonox_console.h \
    6                 orxonox_console_entry.cc orxonox_console_entry.h \
    7                 orxonox_console_log.cc orxonox_console_log.h
     5console_SOURCES=orxonox_console.cc orxonox_console_entry.cc orxonox_console_log.cc
     6noinst_HEADERS=orxonox_console.h orxonox_console_entry.h orxonox_console_log.h
    87
    98#  uncomment the following if bencoder requires the math library

  • orxonox/trunk/console/Makefile.in

    r2019 r2589  
    115115#AM_LDFLAGS=`pkg-config --libs  gtk+-2.0`
    116116bin_PROGRAMS = console
    117 console_SOURCES = orxonox_console.cc orxonox_console.h \
    118                 orxonox_console_entry.cc orxonox_console_entry.h \
    119                 orxonox_console_log.cc orxonox_console_log.h
    120 
     117console_SOURCES = orxonox_console.cc orxonox_console_entry.cc orxonox_console_log.cc
     118noinst_HEADERS = orxonox_console.h orxonox_console_entry.h orxonox_console_log.h
    121119subdir = console
    122120ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    145143CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    146144        -o $@
    147 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    148         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    149 CCLD = $(CC)
    150 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    151145DIST_SOURCES = $(console_SOURCES)
    152 DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
     146HEADERS = $(noinst_HEADERS)
     147
     148DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
    153149SOURCES = $(console_SOURCES)
    154150
    … …  
    310306check-am: all-am
    311307check: check-am
    312 all-am: Makefile $(PROGRAMS)
     308all-am: Makefile $(PROGRAMS) $(HEADERS)
    313309
    314310installdirs:

  • orxonox/trunk/gui/Makefile.am

    r2580 r2589  
    33
    44bin_PROGRAMS=gui
    5 gui_SOURCES=orxonox_gui.cc orxonox_gui.h \
    6         orxonox_gui_video.cc orxonox_gui_video.h \
    7         orxonox_gui_audio.cc orxonox_gui_audio.h \
    8         orxonox_gui_exec.cc orxonox_gui_exec.h \
    9         orxonox_gui_flags.cc orxonox_gui_flags.h \
    10         orxonox_gui_banner.cc orxonox_gui_banner.h
    11 #orxonox_gui_file.cc
     5gui_SOURCES=orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc orxonox_gui_exec.cc orxonox_gui_flags.cc orxonox_gui_banner.cc
     6
     7noinst_HEADERS=orxonox_gui.h orxonox_gui_video.h orxonox_gui_audio.h orxonox_gui_exec.h orxonox_gui_flags.h orxonox_gui_banner.h
    128
    139#  uncomment the following if bencoder requires the math library

  • orxonox/trunk/gui/Makefile.in

    r2580 r2589  
    115115#AM_LDFLAGS=`pkg-config --libs  gtk+-2.0`
    116116bin_PROGRAMS = gui
    117 gui_SOURCES = orxonox_gui.cc orxonox_gui.h \
    118         orxonox_gui_video.cc orxonox_gui_video.h \
    119         orxonox_gui_audio.cc orxonox_gui_audio.h \
    120         orxonox_gui_exec.cc orxonox_gui_exec.h \
    121         orxonox_gui_flags.cc orxonox_gui_flags.h \
    122         orxonox_gui_banner.cc orxonox_gui_banner.h
    123 
    124 #orxonox_gui_file.cc
     117gui_SOURCES = orxonox_gui.cc orxonox_gui_video.cc       orxonox_gui_audio.cc orxonox_gui_exec.cc orxonox_gui_flags.cc orxonox_gui_banner.cc
     118
     119noinst_HEADERS = orxonox_gui.h orxonox_gui_video.h orxonox_gui_audio.h orxonox_gui_exec.h orxonox_gui_flags.h orxonox_gui_banner.h
    125120
    126121#  uncomment the following if bencoder requires the math library
    … …  
    163158CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    164159        -o $@
    165 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    166         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    167 CCLD = $(CC)
    168 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    169160DIST_SOURCES = $(gui_SOURCES)
    170 DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
     161HEADERS = $(noinst_HEADERS)
     162
     163DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
    171164SOURCES = $(gui_SOURCES)
    172165
    … …  
    331324check-am: all-am
    332325check: check-am
    333 all-am: Makefile $(PROGRAMS)
     326all-am: Makefile $(PROGRAMS) $(HEADERS)
    334327
    335328installdirs:

  • orxonox/trunk/src/Makefile.am

    r2551 r2589  
    77bin_PROGRAMS=orxonox
    88orxonox_SOURCES=orxonox.cc world.cc player.cc data_tank.cc world_entity.cc vector.cc camera.cc collision.cc command_node.cc ini_parser.cc keynames.cc track.cc base_entity.cc
     9
     10noinst_HEADERS=ability.h data_tank.h npc.h stdincl.h ai.h environment.h orxonox.h synchronisable.h base_entity.h error.h player.h track.h camera.h ini_parser.h power_up.h vector.h collision.h keynames.h proto_class.h world.h command_node.h list.h shoot_laser.h world_entity.h coordinates.h message_structures.h shoot_rocket.h
     11
    912
    1013#  uncomment the following if bencoder requires the math library

  • orxonox/trunk/src/Makefile.in

    r2551 r2589  
    118118bin_PROGRAMS = orxonox
    119119orxonox_SOURCES = orxonox.cc world.cc player.cc data_tank.cc world_entity.cc vector.cc camera.cc collision.cc command_node.cc ini_parser.cc keynames.cc track.cc base_entity.cc
     120
     121noinst_HEADERS = ability.h data_tank.h npc.h stdincl.h ai.h environment.h orxonox.h synchronisable.h base_entity.h error.h player.h track.h camera.h ini_parser.h power_up.h vector.h collision.h keynames.h proto_class.h world.h command_node.h list.h shoot_laser.h world_entity.h coordinates.h message_structures.h shoot_rocket.h
    120122subdir = src
    121123ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    153155        -o $@
    154156DIST_SOURCES = $(orxonox_SOURCES)
    155 DIST_COMMON = $(srcdir)/Makefile.in ChangeLog INSTALL Makefile.am
     157HEADERS = $(noinst_HEADERS)
     158
     159DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in INSTALL \
     160        Makefile.am
    156161SOURCES = $(orxonox_SOURCES)
    157162
    … …  
    323328check-am: all-am
    324329check: check-am
    325 all-am: Makefile $(PROGRAMS)
     330all-am: Makefile $(PROGRAMS) $(HEADERS)
    326331
    327332installdirs:
Note: See TracChangeset for help on using the changeset viewer.