Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5413 in orxonox.OLD for trunk/src/lib/graphics


Ignore:
Timestamp:
Oct 20, 2005, 11:42:08 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: reverted to old revision 5409, removing the LIBTOOL-stuff with command:
svn merge . . -r HEAD:5409

Reason:
Timing:
Default:

real 1m1.111s
user 1m31.534s
sys 0m6.903s

LIBTOOL:

real 2m21.384s
user 3m12.141s
sys 0m36.896s

→ compileTime doubled

Location:
trunk/src/lib/graphics
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/graphics/Makefile.am

    r5410 r5413  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXgraphics.la
     4noinst_LIBRARIES = libORXgraphics.a
    55
    6 libORXgraphics_la_SOURCES = graphics_engine.cc \
    7                             light.cc \
    8                             shader.cc \
    9                             render2D/render_2d.cc \
    10                             render2D/element_2d.cc \
    11                             text_engine/text_engine.cc \
    12                             text_engine/text.cc \
    13                             text_engine/font.cc
     6libORXgraphics_a_SOURCES = graphics_engine.cc \
     7                           light.cc \
     8                           shader.cc \
     9                           render2D/render_2d.cc \
     10                           render2D/element_2d.cc \
     11                           text_engine/text_engine.cc \
     12                           text_engine/text.cc \
     13                           text_engine/font.cc
    1414
    1515noinst_HEADERS = graphics_engine.h \

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

    r5412 r5413  
    1616
    1717
    18 SOURCES = $(libORXgraphics_la_SOURCES)
     18SOURCES = $(libORXgraphics_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 LTLIBRARIES = $(noinst_LTLIBRARIES)
    52 libORXgraphics_la_LIBADD =
    53 am_libORXgraphics_la_OBJECTS = graphics_engine.lo light.lo shader.lo \
    54         render_2d.lo element_2d.lo text_engine.lo text.lo font.lo
    55 libORXgraphics_la_OBJECTS = $(am_libORXgraphics_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXgraphics_a_AR = $(AR) $(ARFLAGS)
     55libORXgraphics_a_LIBADD =
     56am_libORXgraphics_a_OBJECTS = graphics_engine.$(OBJEXT) \
     57        light.$(OBJEXT) shader.$(OBJEXT) render_2d.$(OBJEXT) \
     58        element_2d.$(OBJEXT) text_engine.$(OBJEXT) text.$(OBJEXT) \
     59        font.$(OBJEXT)
     60libORXgraphics_a_OBJECTS = $(am_libORXgraphics_a_OBJECTS)
    5661DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    5762depcomp = $(SHELL) $(top_srcdir)/depcomp
    5863am__depfiles_maybe = depfiles
    59 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/element_2d.Plo \
    60 @AMDEP_TRUE@    ./$(DEPDIR)/font.Plo \
    61 @AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/light.Plo ./$(DEPDIR)/render_2d.Plo \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/shader.Plo ./$(DEPDIR)/text.Plo \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Plo
     64@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/element_2d.Po ./$(DEPDIR)/font.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/render_2d.Po \
     67@AMDEP_TRUE@    ./$(DEPDIR)/shader.Po ./$(DEPDIR)/text.Po \
     68@AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Po
    6569CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6670        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    67 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    68         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    69         $(AM_CXXFLAGS) $(CXXFLAGS)
    7071CXXLD = $(CXX)
    71 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    72         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    73 SOURCES = $(libORXgraphics_la_SOURCES)
    74 DIST_SOURCES = $(libORXgraphics_la_SOURCES)
     72CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     73        -o $@
     74SOURCES = $(libORXgraphics_a_SOURCES)
     75DIST_SOURCES = $(libORXgraphics_a_SOURCES)
    7576RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
    7677        html-recursive info-recursive install-data-recursive \
    … …  
    8889AMDEP_TRUE = @AMDEP_TRUE@
    8990AMTAR = @AMTAR@
    90 AR = @AR@
    9191AUTOCONF = @AUTOCONF@
    9292AUTOHEADER = @AUTOHEADER@
    … …  
    101101CURL_LIBS = @CURL_LIBS@
    102102CXX = @CXX@
    103 CXXCPP = @CXXCPP@
    104103CXXDEPMODE = @CXXDEPMODE@
    105104CXXFLAGS = @CXXFLAGS@
    … …  
    113112DOXYGEN_FALSE = @DOXYGEN_FALSE@
    114113DOXYGEN_TRUE = @DOXYGEN_TRUE@
    115 ECHO = @ECHO@
    116114ECHO_C = @ECHO_C@
    117115ECHO_N = @ECHO_N@
    … …  
    119117EGREP = @EGREP@
    120118EXEEXT = @EXEEXT@
    121 F77 = @F77@
    122 FFLAGS = @FFLAGS@
    123119GPROF = @GPROF@
    124120GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    135131LIBOBJS = @LIBOBJS@
    136132LIBS = @LIBS@
    137 LIBTOOL = @LIBTOOL@
    138 LN_S = @LN_S@
    139133LTLIBOBJS = @LTLIBOBJS@
    140134MAKEINFO = @MAKEINFO@
    … …  
    156150SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    157151VERSION = @VERSION@
    158 ac_ct_AR = @ac_ct_AR@
    159152ac_ct_CC = @ac_ct_CC@
    160153ac_ct_CXX = @ac_ct_CXX@
    161 ac_ct_F77 = @ac_ct_F77@
    162154ac_ct_RANLIB = @ac_ct_RANLIB@
    163155ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    202194target_vendor = @target_vendor@
    203195MAINSRCDIR = ../..
    204 noinst_LTLIBRARIES = libORXgraphics.la
    205 libORXgraphics_la_SOURCES = graphics_engine.cc \
    206                             light.cc \
    207                             shader.cc \
    208                             render2D/render_2d.cc \
    209                             render2D/element_2d.cc \
    210                             text_engine/text_engine.cc \
    211                             text_engine/text.cc \
    212                             text_engine/font.cc
     196noinst_LIBRARIES = libORXgraphics.a
     197libORXgraphics_a_SOURCES = graphics_engine.cc \
     198                           light.cc \
     199                           shader.cc \
     200                           render2D/render_2d.cc \
     201                           render2D/element_2d.cc \
     202                           text_engine/text_engine.cc \
     203                           text_engine/text.cc \
     204                           text_engine/font.cc
    213205
    214206noinst_HEADERS = graphics_engine.h \
    … …  
    228220
    229221.SUFFIXES:
    230 .SUFFIXES: .cc .lo .o .obj
     222.SUFFIXES: .cc .o .obj
    231223$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    232224        @for dep in $?; do \
    … …  
    259251        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    260252
    261 clean-noinstLTLIBRARIES:
    262         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    263         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
    264           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    265           test "$$dir" != "$$p" || dir=.; \
    266           echo "rm -f \"$${dir}/so_locations\""; \
    267           rm -f "$${dir}/so_locations"; \
    268         done
    269 libORXgraphics.la: $(libORXgraphics_la_OBJECTS) $(libORXgraphics_la_DEPENDENCIES)
    270         $(CXXLINK)  $(libORXgraphics_la_LDFLAGS) $(libORXgraphics_la_OBJECTS) $(libORXgraphics_la_LIBADD) $(LIBS)
     253clean-noinstLIBRARIES:
     254        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     255libORXgraphics.a: $(libORXgraphics_a_OBJECTS) $(libORXgraphics_a_DEPENDENCIES)
     256        -rm -f libORXgraphics.a
     257        $(libORXgraphics_a_AR) libORXgraphics.a $(libORXgraphics_a_OBJECTS) $(libORXgraphics_a_LIBADD)
     258        $(RANLIB) libORXgraphics.a
    271259
    272260mostlyclean-compile:
    … …  
    276264        -rm -f *.tab.c
    277265
    278 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/element_2d.Plo@am__quote@
    279 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font.Plo@am__quote@
    280 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Plo@am__quote@
    281 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Plo@am__quote@
    282 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/render_2d.Plo@am__quote@
    283 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shader.Plo@am__quote@
    284 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text.Plo@am__quote@
    285 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_engine.Plo@am__quote@
     266@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/element_2d.Po@am__quote@
     267@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font.Po@am__quote@
     268@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@
     269@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Po@am__quote@
     270@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/render_2d.Po@am__quote@
     271@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shader.Po@am__quote@
     272@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text.Po@am__quote@
     273@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_engine.Po@am__quote@
    286274
    287275.cc.o:
    … …  
    301289@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    302290
    303 .cc.lo:
    304 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    305 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    306 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    307 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    308 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    309 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    310 
    311291render_2d.o: render2D/render_2d.cc
    312292@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT render_2d.o -MD -MP -MF "$(DEPDIR)/render_2d.Tpo" -c -o render_2d.o `test -f 'render2D/render_2d.cc' || echo '$(srcdir)/'`render2D/render_2d.cc; \
    … …  
    325305@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o render_2d.obj `if test -f 'render2D/render_2d.cc'; then $(CYGPATH_W) 'render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/render2D/render_2d.cc'; fi`
    326306
    327 render_2d.lo: render2D/render_2d.cc
    328 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT render_2d.lo -MD -MP -MF "$(DEPDIR)/render_2d.Tpo" -c -o render_2d.lo `test -f 'render2D/render_2d.cc' || echo '$(srcdir)/'`render2D/render_2d.cc; \
    329 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/render_2d.Tpo" "$(DEPDIR)/render_2d.Plo"; else rm -f "$(DEPDIR)/render_2d.Tpo"; exit 1; fi
    330 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='render2D/render_2d.cc' object='render_2d.lo' libtool=yes @AMDEPBACKSLASH@
    331 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/render_2d.Plo' tmpdepfile='$(DEPDIR)/render_2d.TPlo' @AMDEPBACKSLASH@
    332 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    333 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o render_2d.lo `test -f 'render2D/render_2d.cc' || echo '$(srcdir)/'`render2D/render_2d.cc
    334 
    335307element_2d.o: render2D/element_2d.cc
    336308@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT element_2d.o -MD -MP -MF "$(DEPDIR)/element_2d.Tpo" -c -o element_2d.o `test -f 'render2D/element_2d.cc' || echo '$(srcdir)/'`render2D/element_2d.cc; \
    … …  
    349321@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o element_2d.obj `if test -f 'render2D/element_2d.cc'; then $(CYGPATH_W) 'render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/render2D/element_2d.cc'; fi`
    350322
    351 element_2d.lo: render2D/element_2d.cc
    352 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT element_2d.lo -MD -MP -MF "$(DEPDIR)/element_2d.Tpo" -c -o element_2d.lo `test -f 'render2D/element_2d.cc' || echo '$(srcdir)/'`render2D/element_2d.cc; \
    353 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/element_2d.Tpo" "$(DEPDIR)/element_2d.Plo"; else rm -f "$(DEPDIR)/element_2d.Tpo"; exit 1; fi
    354 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='render2D/element_2d.cc' object='element_2d.lo' libtool=yes @AMDEPBACKSLASH@
    355 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/element_2d.Plo' tmpdepfile='$(DEPDIR)/element_2d.TPlo' @AMDEPBACKSLASH@
    356 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    357 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o element_2d.lo `test -f 'render2D/element_2d.cc' || echo '$(srcdir)/'`render2D/element_2d.cc
    358 
    359323text_engine.o: text_engine/text_engine.cc
    360324@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_engine.o -MD -MP -MF "$(DEPDIR)/text_engine.Tpo" -c -o text_engine.o `test -f 'text_engine/text_engine.cc' || echo '$(srcdir)/'`text_engine/text_engine.cc; \
    … …  
    373337@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.obj `if test -f 'text_engine/text_engine.cc'; then $(CYGPATH_W) 'text_engine/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/text_engine.cc'; fi`
    374338
    375 text_engine.lo: text_engine/text_engine.cc
    376 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_engine.lo -MD -MP -MF "$(DEPDIR)/text_engine.Tpo" -c -o text_engine.lo `test -f 'text_engine/text_engine.cc' || echo '$(srcdir)/'`text_engine/text_engine.cc; \
    377 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Plo"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
    378 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/text_engine.cc' object='text_engine.lo' libtool=yes @AMDEPBACKSLASH@
    379 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Plo' tmpdepfile='$(DEPDIR)/text_engine.TPlo' @AMDEPBACKSLASH@
    380 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    381 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.lo `test -f 'text_engine/text_engine.cc' || echo '$(srcdir)/'`text_engine/text_engine.cc
    382 
    383339text.o: text_engine/text.cc
    384340@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text.o -MD -MP -MF "$(DEPDIR)/text.Tpo" -c -o text.o `test -f 'text_engine/text.cc' || echo '$(srcdir)/'`text_engine/text.cc; \
    … …  
    397353@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text.obj `if test -f 'text_engine/text.cc'; then $(CYGPATH_W) 'text_engine/text.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/text.cc'; fi`
    398354
    399 text.lo: text_engine/text.cc
    400 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text.lo -MD -MP -MF "$(DEPDIR)/text.Tpo" -c -o text.lo `test -f 'text_engine/text.cc' || echo '$(srcdir)/'`text_engine/text.cc; \
    401 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text.Tpo" "$(DEPDIR)/text.Plo"; else rm -f "$(DEPDIR)/text.Tpo"; exit 1; fi
    402 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/text.cc' object='text.lo' libtool=yes @AMDEPBACKSLASH@
    403 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text.Plo' tmpdepfile='$(DEPDIR)/text.TPlo' @AMDEPBACKSLASH@
    404 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    405 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text.lo `test -f 'text_engine/text.cc' || echo '$(srcdir)/'`text_engine/text.cc
    406 
    407355font.o: text_engine/font.cc
    408356@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT font.o -MD -MP -MF "$(DEPDIR)/font.Tpo" -c -o font.o `test -f 'text_engine/font.cc' || echo '$(srcdir)/'`text_engine/font.cc; \
    … …  
    420368@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    421369@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o font.obj `if test -f 'text_engine/font.cc'; then $(CYGPATH_W) 'text_engine/font.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/font.cc'; fi`
    422 
    423 font.lo: text_engine/font.cc
    424 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT font.lo -MD -MP -MF "$(DEPDIR)/font.Tpo" -c -o font.lo `test -f 'text_engine/font.cc' || echo '$(srcdir)/'`text_engine/font.cc; \
    425 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/font.Tpo" "$(DEPDIR)/font.Plo"; else rm -f "$(DEPDIR)/font.Tpo"; exit 1; fi
    426 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/font.cc' object='font.lo' libtool=yes @AMDEPBACKSLASH@
    427 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/font.Plo' tmpdepfile='$(DEPDIR)/font.TPlo' @AMDEPBACKSLASH@
    428 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    429 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o font.lo `test -f 'text_engine/font.cc' || echo '$(srcdir)/'`text_engine/font.cc
    430 
    431 mostlyclean-libtool:
    432         -rm -f *.lo
    433 
    434 clean-libtool:
    435         -rm -rf .libs _libs
    436 
    437 distclean-libtool:
    438         -rm -f libtool
    439370uninstall-info-am:
    440371
    … …  
    602533check-am: all-am
    603534check: check-recursive
    604 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     535all-am: Makefile $(LIBRARIES) $(HEADERS)
    605536installdirs: installdirs-recursive
    606537installdirs-am:
    … …  
    631562clean: clean-recursive
    632563
    633 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
    634         mostlyclean-am
     564clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    635565
    636566distclean: distclean-recursive
    … …  
    638568        -rm -f Makefile
    639569distclean-am: clean-am distclean-compile distclean-generic \
    640         distclean-libtool distclean-tags
     570        distclean-tags
    641571
    642572dvi: dvi-recursive
    … …  
    667597mostlyclean: mostlyclean-recursive
    668598
    669 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    670         mostlyclean-libtool
     599mostlyclean-am: mostlyclean-compile mostlyclean-generic
    671600
    672601pdf: pdf-recursive
    … …  
    683612
    684613.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
    685         clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
    686         clean-recursive ctags ctags-recursive distclean \
    687         distclean-compile distclean-generic distclean-libtool \
    688         distclean-recursive distclean-tags distdir dvi dvi-am html \
    689         html-am info info-am install install-am install-data \
    690         install-data-am install-exec install-exec-am install-info \
    691         install-info-am install-man install-strip installcheck \
    692         installcheck-am installdirs installdirs-am maintainer-clean \
    693         maintainer-clean-generic maintainer-clean-recursive \
    694         mostlyclean mostlyclean-compile mostlyclean-generic \
    695         mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
     614        clean clean-generic clean-noinstLIBRARIES clean-recursive \
     615        ctags ctags-recursive distclean distclean-compile \
     616        distclean-generic distclean-recursive distclean-tags distdir \
     617        dvi dvi-am html html-am info info-am install install-am \
     618        install-data install-data-am install-exec install-exec-am \
     619        install-info install-info-am install-man install-strip \
     620        installcheck installcheck-am installdirs installdirs-am \
     621        maintainer-clean maintainer-clean-generic \
     622        maintainer-clean-recursive mostlyclean mostlyclean-compile \
     623        mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
    696624        tags tags-recursive uninstall uninstall-am uninstall-info-am
    697625

  • trunk/src/lib/graphics/importer/Makefile.am

    r5410 r5413  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXimporter.la
     4noinst_LIBRARIES = libORXimporter.a
    55
    6 libORXimporter_la_SOURCES = model.cc \
    7                             objModel.cc \
    8                             primitive_model.cc \
    9                             md2Model.cc \
    10                             material.cc \
    11                             texture.cc
     6libORXimporter_a_SOURCES = model.cc \
     7                           objModel.cc \
     8                           primitive_model.cc \
     9                           md2Model.cc \
     10                           material.cc \
     11                           texture.cc
    1212
    1313

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

    r5412 r5413  
    1616
    1717
    18 SOURCES = $(libORXimporter_la_SOURCES)
     18SOURCES = $(libORXimporter_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 LTLIBRARIES = $(noinst_LTLIBRARIES)
    52 libORXimporter_la_LIBADD =
    53 am_libORXimporter_la_OBJECTS = model.lo objModel.lo primitive_model.lo \
    54         md2Model.lo material.lo texture.lo
    55 libORXimporter_la_OBJECTS = $(am_libORXimporter_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXimporter_a_AR = $(AR) $(ARFLAGS)
     55libORXimporter_a_LIBADD =
     56am_libORXimporter_a_OBJECTS = model.$(OBJEXT) objModel.$(OBJEXT) \
     57        primitive_model.$(OBJEXT) md2Model.$(OBJEXT) \
     58        material.$(OBJEXT) texture.$(OBJEXT)
     59libORXimporter_a_OBJECTS = $(am_libORXimporter_a_OBJECTS)
    5660DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    5761depcomp = $(SHELL) $(top_srcdir)/depcomp
    5862am__depfiles_maybe = depfiles
    59 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/material.Plo \
    60 @AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Plo ./$(DEPDIR)/model.Plo \
    61 @AMDEP_TRUE@    ./$(DEPDIR)/objModel.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Plo \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/texture.Plo
     63@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/material.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Po ./$(DEPDIR)/model.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
     67@AMDEP_TRUE@    ./$(DEPDIR)/texture.Po
    6468CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6569        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    66 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    67         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    68         $(AM_CXXFLAGS) $(CXXFLAGS)
    6970CXXLD = $(CXX)
    70 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    71         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    72 SOURCES = $(libORXimporter_la_SOURCES)
    73 DIST_SOURCES = $(libORXimporter_la_SOURCES)
     71CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     72        -o $@
     73SOURCES = $(libORXimporter_a_SOURCES)
     74DIST_SOURCES = $(libORXimporter_a_SOURCES)
    7475HEADERS = $(noinst_HEADERS)
    7576ETAGS = etags
    … …  
    8081AMDEP_TRUE = @AMDEP_TRUE@
    8182AMTAR = @AMTAR@
    82 AR = @AR@
    8383AUTOCONF = @AUTOCONF@
    8484AUTOHEADER = @AUTOHEADER@
    … …  
    9393CURL_LIBS = @CURL_LIBS@
    9494CXX = @CXX@
    95 CXXCPP = @CXXCPP@
    9695CXXDEPMODE = @CXXDEPMODE@
    9796CXXFLAGS = @CXXFLAGS@
    … …  
    105104DOXYGEN_FALSE = @DOXYGEN_FALSE@
    106105DOXYGEN_TRUE = @DOXYGEN_TRUE@
    107 ECHO = @ECHO@
    108106ECHO_C = @ECHO_C@
    109107ECHO_N = @ECHO_N@
    … …  
    111109EGREP = @EGREP@
    112110EXEEXT = @EXEEXT@
    113 F77 = @F77@
    114 FFLAGS = @FFLAGS@
    115111GPROF = @GPROF@
    116112GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    127123LIBOBJS = @LIBOBJS@
    128124LIBS = @LIBS@
    129 LIBTOOL = @LIBTOOL@
    130 LN_S = @LN_S@
    131125LTLIBOBJS = @LTLIBOBJS@
    132126MAKEINFO = @MAKEINFO@
    … …  
    148142SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    149143VERSION = @VERSION@
    150 ac_ct_AR = @ac_ct_AR@
    151144ac_ct_CC = @ac_ct_CC@
    152145ac_ct_CXX = @ac_ct_CXX@
    153 ac_ct_F77 = @ac_ct_F77@
    154146ac_ct_RANLIB = @ac_ct_RANLIB@
    155147ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    194186target_vendor = @target_vendor@
    195187MAINSRCDIR = ../../..
    196 noinst_LTLIBRARIES = libORXimporter.la
    197 libORXimporter_la_SOURCES = model.cc \
    198                             objModel.cc \
    199                             primitive_model.cc \
    200                             md2Model.cc \
    201                             material.cc \
    202                             texture.cc
     188noinst_LIBRARIES = libORXimporter.a
     189libORXimporter_a_SOURCES = model.cc \
     190                           objModel.cc \
     191                           primitive_model.cc \
     192                           md2Model.cc \
     193                           material.cc \
     194                           texture.cc
    203195
    204196noinst_HEADERS = abstract_model.h \
    … …  
    215207
    216208.SUFFIXES:
    217 .SUFFIXES: .cc .lo .o .obj
     209.SUFFIXES: .cc .o .obj
    218210$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    219211        @for dep in $?; do \
    … …  
    246238        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    247239
    248 clean-noinstLTLIBRARIES:
    249         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    250         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
    251           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    252           test "$$dir" != "$$p" || dir=.; \
    253           echo "rm -f \"$${dir}/so_locations\""; \
    254           rm -f "$${dir}/so_locations"; \
    255         done
    256 libORXimporter.la: $(libORXimporter_la_OBJECTS) $(libORXimporter_la_DEPENDENCIES)
    257         $(CXXLINK)  $(libORXimporter_la_LDFLAGS) $(libORXimporter_la_OBJECTS) $(libORXimporter_la_LIBADD) $(LIBS)
     240clean-noinstLIBRARIES:
     241        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     242libORXimporter.a: $(libORXimporter_a_OBJECTS) $(libORXimporter_a_DEPENDENCIES)
     243        -rm -f libORXimporter.a
     244        $(libORXimporter_a_AR) libORXimporter.a $(libORXimporter_a_OBJECTS) $(libORXimporter_a_LIBADD)
     245        $(RANLIB) libORXimporter.a
    258246
    259247mostlyclean-compile:
    … …  
    263251        -rm -f *.tab.c
    264252
    265 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Plo@am__quote@
    266 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Plo@am__quote@
    267 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Plo@am__quote@
    268 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Plo@am__quote@
    269 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Plo@am__quote@
    270 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Plo@am__quote@
     253@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
     254@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Po@am__quote@
     255@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
     256@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Po@am__quote@
     257@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@
     258@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
    271259
    272260.cc.o:
    … …  
    285273@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    286274@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    287 
    288 .cc.lo:
    289 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    290 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    291 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    292 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    293 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    294 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    295 
    296 mostlyclean-libtool:
    297         -rm -f *.lo
    298 
    299 clean-libtool:
    300         -rm -rf .libs _libs
    301 
    302 distclean-libtool:
    303         -rm -f libtool
    304275uninstall-info-am:
    305276
    … …  
    381352check-am: all-am
    382353check: check-am
    383 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     354all-am: Makefile $(LIBRARIES) $(HEADERS)
    384355installdirs:
    385356install: install-am
    … …  
    409380clean: clean-am
    410381
    411 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
    412         mostlyclean-am
     382clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    413383
    414384distclean: distclean-am
    … …  
    416386        -rm -f Makefile
    417387distclean-am: clean-am distclean-compile distclean-generic \
    418         distclean-libtool distclean-tags
     388        distclean-tags
    419389
    420390dvi: dvi-am
    … …  
    445415mostlyclean: mostlyclean-am
    446416
    447 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    448         mostlyclean-libtool
     417mostlyclean-am: mostlyclean-compile mostlyclean-generic
    449418
    450419pdf: pdf-am
    … …  
    459428
    460429.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    461         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
    462         distclean-compile distclean-generic distclean-libtool \
    463         distclean-tags distdir dvi dvi-am html html-am info info-am \
    464         install install-am install-data install-data-am install-exec \
    465         install-exec-am install-info install-info-am install-man \
    466         install-strip installcheck installcheck-am installdirs \
    467         maintainer-clean maintainer-clean-generic mostlyclean \
    468         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    469         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    470         uninstall-info-am
     430        clean-noinstLIBRARIES ctags distclean distclean-compile \
     431        distclean-generic distclean-tags distdir dvi dvi-am html \
     432        html-am info info-am install install-am install-data \
     433        install-data-am install-exec install-exec-am install-info \
     434        install-info-am install-man install-strip installcheck \
     435        installcheck-am installdirs maintainer-clean \
     436        maintainer-clean-generic mostlyclean mostlyclean-compile \
     437        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     438        uninstall-am uninstall-info-am
    471439
    472440include $(MAINSRCDIR)/defs/include_paths.am

  • trunk/src/lib/graphics/spatial_separation/Makefile.am

    r5410 r5413  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXquadtree.la
     4noinst_LIBRARIES = libORXquadtree.a
    55
    6 libORXquadtree_la_SOURCES = quadtree.cc \
    7                             quadtree_node.cc \
    8                             spatial_separation.cc
     6libORXquadtree_a_SOURCES = quadtree.cc \
     7                           quadtree_node.cc \
     8                           spatial_separation.cc
    99
    1010noinst_HEADERS =  quadtree.h \

  • trunk/src/lib/graphics/spatial_separation/Makefile.in

    r5412 r5413  
    1616
    1717
    18 SOURCES = $(libORXquadtree_la_SOURCES)
     18SOURCES = $(libORXquadtree_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 LTLIBRARIES = $(noinst_LTLIBRARIES)
    52 libORXquadtree_la_LIBADD =
    53 am_libORXquadtree_la_OBJECTS = quadtree.lo quadtree_node.lo \
    54         spatial_separation.lo
    55 libORXquadtree_la_OBJECTS = $(am_libORXquadtree_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXquadtree_a_AR = $(AR) $(ARFLAGS)
     55libORXquadtree_a_LIBADD =
     56am_libORXquadtree_a_OBJECTS = quadtree.$(OBJEXT) \
     57        quadtree_node.$(OBJEXT) spatial_separation.$(OBJEXT)
     58libORXquadtree_a_OBJECTS = $(am_libORXquadtree_a_OBJECTS)
    5659DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    5760depcomp = $(SHELL) $(top_srcdir)/depcomp
    5861am__depfiles_maybe = depfiles
    59 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/quadtree.Plo \
    60 @AMDEP_TRUE@    ./$(DEPDIR)/quadtree_node.Plo \
    61 @AMDEP_TRUE@    ./$(DEPDIR)/spatial_separation.Plo
     62@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/quadtree.Po \
     63@AMDEP_TRUE@    ./$(DEPDIR)/quadtree_node.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/spatial_separation.Po
    6265CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6366        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    64 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    65         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    66         $(AM_CXXFLAGS) $(CXXFLAGS)
    6767CXXLD = $(CXX)
    68 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    69         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    70 SOURCES = $(libORXquadtree_la_SOURCES)
    71 DIST_SOURCES = $(libORXquadtree_la_SOURCES)
     68CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     69        -o $@
     70SOURCES = $(libORXquadtree_a_SOURCES)
     71DIST_SOURCES = $(libORXquadtree_a_SOURCES)
    7272HEADERS = $(noinst_HEADERS)
    7373ETAGS = etags
    … …  
    7878AMDEP_TRUE = @AMDEP_TRUE@
    7979AMTAR = @AMTAR@
    80 AR = @AR@
    8180AUTOCONF = @AUTOCONF@
    8281AUTOHEADER = @AUTOHEADER@
    … …  
    9190CURL_LIBS = @CURL_LIBS@
    9291CXX = @CXX@
    93 CXXCPP = @CXXCPP@
    9492CXXDEPMODE = @CXXDEPMODE@
    9593CXXFLAGS = @CXXFLAGS@
    … …  
    103101DOXYGEN_FALSE = @DOXYGEN_FALSE@
    104102DOXYGEN_TRUE = @DOXYGEN_TRUE@
    105 ECHO = @ECHO@
    106103ECHO_C = @ECHO_C@
    107104ECHO_N = @ECHO_N@
    … …  
    109106EGREP = @EGREP@
    110107EXEEXT = @EXEEXT@
    111 F77 = @F77@
    112 FFLAGS = @FFLAGS@
    113108GPROF = @GPROF@
    114109GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    125120LIBOBJS = @LIBOBJS@
    126121LIBS = @LIBS@
    127 LIBTOOL = @LIBTOOL@
    128 LN_S = @LN_S@
    129122LTLIBOBJS = @LTLIBOBJS@
    130123MAKEINFO = @MAKEINFO@
    … …  
    146139SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    147140VERSION = @VERSION@
    148 ac_ct_AR = @ac_ct_AR@
    149141ac_ct_CC = @ac_ct_CC@
    150142ac_ct_CXX = @ac_ct_CXX@
    151 ac_ct_F77 = @ac_ct_F77@
    152143ac_ct_RANLIB = @ac_ct_RANLIB@
    153144ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    192183target_vendor = @target_vendor@
    193184MAINSRCDIR = ../../..
    194 noinst_LTLIBRARIES = libORXquadtree.la
    195 libORXquadtree_la_SOURCES = quadtree.cc \
    196                             quadtree_node.cc \
    197                             spatial_separation.cc
     185noinst_LIBRARIES = libORXquadtree.a
     186libORXquadtree_a_SOURCES = quadtree.cc \
     187                           quadtree_node.cc \
     188                           spatial_separation.cc
    198189
    199190noinst_HEADERS = quadtree.h \
    … …  
    204195
    205196.SUFFIXES:
    206 .SUFFIXES: .cc .lo .o .obj
     197.SUFFIXES: .cc .o .obj
    207198$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    208199        @for dep in $?; do \
    … …  
    235226        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    236227
    237 clean-noinstLTLIBRARIES:
    238         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    239         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
    240           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    241           test "$$dir" != "$$p" || dir=.; \
    242           echo "rm -f \"$${dir}/so_locations\""; \
    243           rm -f "$${dir}/so_locations"; \
    244         done
    245 libORXquadtree.la: $(libORXquadtree_la_OBJECTS) $(libORXquadtree_la_DEPENDENCIES)
    246         $(CXXLINK)  $(libORXquadtree_la_LDFLAGS) $(libORXquadtree_la_OBJECTS) $(libORXquadtree_la_LIBADD) $(LIBS)
     228clean-noinstLIBRARIES:
     229        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     230libORXquadtree.a: $(libORXquadtree_a_OBJECTS) $(libORXquadtree_a_DEPENDENCIES)
     231        -rm -f libORXquadtree.a
     232        $(libORXquadtree_a_AR) libORXquadtree.a $(libORXquadtree_a_OBJECTS) $(libORXquadtree_a_LIBADD)
     233        $(RANLIB) libORXquadtree.a
    247234
    248235mostlyclean-compile:
    … …  
    252239        -rm -f *.tab.c
    253240
    254 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree.Plo@am__quote@
    255 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree_node.Plo@am__quote@
    256 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spatial_separation.Plo@am__quote@
     241@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree.Po@am__quote@
     242@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree_node.Po@am__quote@
     243@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spatial_separation.Po@am__quote@
    257244
    258245.cc.o:
    … …  
    271258@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    272259@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    273 
    274 .cc.lo:
    275 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    276 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    277 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    278 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    279 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    280 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    281 
    282 mostlyclean-libtool:
    283         -rm -f *.lo
    284 
    285 clean-libtool:
    286         -rm -rf .libs _libs
    287 
    288 distclean-libtool:
    289         -rm -f libtool
    290260uninstall-info-am:
    291261
    … …  
    367337check-am: all-am
    368338check: check-am
    369 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     339all-am: Makefile $(LIBRARIES) $(HEADERS)
    370340installdirs:
    371341install: install-am
    … …  
    395365clean: clean-am
    396366
    397 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
    398         mostlyclean-am
     367clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    399368
    400369distclean: distclean-am
    … …  
    402371        -rm -f Makefile
    403372distclean-am: clean-am distclean-compile distclean-generic \
    404         distclean-libtool distclean-tags
     373        distclean-tags
    405374
    406375dvi: dvi-am
    … …  
    431400mostlyclean: mostlyclean-am
    432401
    433 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    434         mostlyclean-libtool
     402mostlyclean-am: mostlyclean-compile mostlyclean-generic
    435403
    436404pdf: pdf-am
    … …  
    445413
    446414.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    447         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
    448         distclean-compile distclean-generic distclean-libtool \
    449         distclean-tags distdir dvi dvi-am html html-am info info-am \
    450         install install-am install-data install-data-am install-exec \
    451         install-exec-am install-info install-info-am install-man \
    452         install-strip installcheck installcheck-am installdirs \
    453         maintainer-clean maintainer-clean-generic mostlyclean \
    454         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    455         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    456         uninstall-info-am
     415        clean-noinstLIBRARIES ctags distclean distclean-compile \
     416        distclean-generic distclean-tags distdir dvi dvi-am html \
     417        html-am info info-am install install-am install-data \
     418        install-data-am install-exec install-exec-am install-info \
     419        install-info-am install-man install-strip installcheck \
     420        installcheck-am installdirs maintainer-clean \
     421        maintainer-clean-generic mostlyclean mostlyclean-compile \
     422        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     423        uninstall-am uninstall-info-am
    457424
    458425include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.