diff --git a/libs/models/Makefile.am b/libs/models/Makefile.am index aae55f880..f584130ab 100644 --- a/libs/models/Makefile.am +++ b/libs/models/Makefile.am @@ -1,47 +1,34 @@ SUBDIRS= alias brush sprite INCLUDES= -I$(top_srcdir)/include -if BUILD_GL -MODELS_GL = libQFmodels_gl.la -AM_CFLAGS = $(GLX_CFLAGS) -else -MODELS_GL = -endif - -if BUILD_SW -MODELS_SW = libQFmodels_sw.la -else -MODELS_SW = -endif - -if BUILD_SW32 -MODELS_SW32 = libQFmodels_sw32.la -else -MODELS_SW32 = -endif - -lib_LTLIBRARIES = libQFmodels.la $(MODELS_GL) $(MODELS_SW) $(MODELS_SW32) +lib_LTLIBRARIES= libQFmodels.la @VID_MODEL_TARGETS@ +EXTRA_LTLIBRARIES= \ + libQFmodels_gl.la libQFmodels_sw.la libQFmodels_sw32.la models_sources = clip_hull.c model.c -libQFmodels_la_LDFLAGS = -version-info 1:0:0 -libQFmodels_la_LIBADD = brush/libbrush.la -libQFmodels_la_SOURCES = $(models_sources) -libQFmodels_la_DEPENDENCIES = brush/libbrush.la +libQFmodels_la_LDFLAGS= -version-info 1:0:0 +libQFmodels_la_LIBADD= brush/libbrush.la +libQFmodels_la_SOURCES= $(models_sources) +libQFmodels_la_DEPENDENCIES= brush/libbrush.la -libQFmodels_gl_la_LDFLAGS = -version-info 1:0:0 -libQFmodels_gl_la_LIBADD = alias/libalias_gl.la brush/libbrush_gl.la sprite/libsprite_gl.la -libQFmodels_gl_la_SOURCES = $(models_sources) gl_model_fullbright.c -libQFmodels_gl_la_DEPENDENCIES = alias/libalias_gl.la brush/libbrush_gl.la sprite/libsprite_gl.la +gl_LIBS= \ + alias/libalias_gl.la brush/libbrush_gl.la sprite/libsprite_gl.la +libQFmodels_gl_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) +libQFmodels_gl_la_LIBADD= $(gl_LIBS) +libQFmodels_gl_la_SOURCES= $(models_sources) gl_model_fullbright.c +libQFmodels_gl_la_DEPENDENCIES= $(gl_LIBS) -libQFmodels_sw_la_LDFLAGS = -version-info 1:0:0 -libQFmodels_sw_la_LIBADD = alias/libalias_sw.la brush/libbrush_sw.la sprite/libsprite_sw.la -libQFmodels_sw_la_SOURCES = $(models_sources) -libQFmodels_sw_la_DEPENDENCIES = alias/libalias_sw.la brush/libbrush_sw.la sprite/libsprite_sw.la +sw_LIBS= \ + alias/libalias_sw.la brush/libbrush_sw.la sprite/libsprite_sw.la +libQFmodels_sw_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) +libQFmodels_sw_la_LIBADD= $(sw_LIBS) +libQFmodels_sw_la_SOURCES= $(models_sources) +libQFmodels_sw_la_DEPENDENCIES= $(sw_LIBS) -libQFmodels_sw32_la_LDFLAGS = -version-info 1:0:0 -libQFmodels_sw32_la_LIBADD = alias/libalias_sw32.la brush/libbrush_sw32.la sprite/libsprite_sw32.la -libQFmodels_sw32_la_SOURCES = $(models_sources) -libQFmodels_sw32_la_DEPENDENCIES = alias/libalias_sw32.la brush/libbrush_sw32.la sprite/libsprite_sw32.la - -LIBLIST = libQFmodels.la libQFmodels_gl.la libQFmodels_sw.la libQFmodels_sw32.la +sw32_LIBS= \ + alias/libalias_sw32.la brush/libbrush_sw32.la sprite/libsprite_sw32.la +libQFmodels_sw32_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) +libQFmodels_sw32_la_LIBADD= $(sw32_LIBS) +libQFmodels_sw32_la_SOURCES= $(models_sources) +libQFmodels_sw32_la_DEPENDENCIES=$(sw32_LIBS) diff --git a/libs/models/alias/Makefile.am b/libs/models/alias/Makefile.am index 93605f0c4..197a26d6a 100644 --- a/libs/models/alias/Makefile.am +++ b/libs/models/alias/Makefile.am @@ -1,30 +1,21 @@ INCLUDES= -I$(top_srcdir)/include +noinst_LTLIBRARIES= libalias_gl.la libalias_sw.la libalias_sw32.la + if BUILD_GL -ALIAS_GL = libalias_gl.la +libalias_gl_la_SOURCES= gl_mesh.c gl_model_alias.c model_alias.c else -ALIAS_GL = +libalias_gl_la_SOURCES= endif if BUILD_SW -ALIAS_SW = libalias_sw.la +libalias_sw_la_SOURCES= sw_model_alias.c model_alias.c else -ALIAS_SW = +libalias_sw_la_SOURCES= endif if BUILD_SW32 -ALIAS_SW32 = libalias_sw32.la +libalias_sw32_la_SOURCES= sw32_model_alias.c model_alias.c else -ALIAS_SW32 = +libalias_sw32_la_SOURCES= endif - -noinst_LTLIBRARIES = $(ALIAS_GL) $(ALIAS_SW) $(ALIAS_SW32) - -libalias_gl_la_LDFLAGS = -version-info 1:0:0 -libalias_gl_la_SOURCES = gl_mesh.c gl_model_alias.c model_alias.c - -libalias_sw_la_LDFLAGS = -version-info 1:0:0 -libalias_sw_la_SOURCES = sw_model_alias.c model_alias.c - -libalias_sw32_la_LDFLAGS = -version-info 1:0:0 -libalias_sw32_la_SOURCES = sw32_model_alias.c model_alias.c diff --git a/libs/models/brush/Makefile.am b/libs/models/brush/Makefile.am index 82425320b..44c3a497c 100644 --- a/libs/models/brush/Makefile.am +++ b/libs/models/brush/Makefile.am @@ -1,33 +1,23 @@ INCLUDES= -I$(top_srcdir)/include +noinst_LTLIBRARIES= libbrush.la libbrush_gl.la libbrush_sw.la libbrush_sw32.la + +libbrush_la_SOURCES= model_brush.c + if BUILD_GL -BRUSH_GL = libbrush_gl.la +libbrush_gl_la_SOURCES= gl_model_brush.c model_brush.c else -BRUSH_GL = +libbrush_gl_la_SOURCES= endif if BUILD_SW -BRUSH_SW = libbrush_sw.la +libbrush_sw_la_SOURCES= sw_model_brush.c model_brush.c else -BRUSH_SW = +libbrush_sw_la_SOURCES= endif if BUILD_SW32 -BRUSH_SW32 = libbrush_sw32.la +libbrush_sw32_la_SOURCES=sw32_model_brush.c model_brush.c else -BRUSH_SW32 = +libbrush_sw32_la_SOURCES= endif - -noinst_LTLIBRARIES = $(BRUSH_GL) $(BRUSH_SW) $(BRUSH_SW32) libbrush.la - -libbrush_la_LDFLAGS = -version-info 1:0:0 -libbrush_la_SOURCES = model_brush.c - -libbrush_gl_la_LDFLAGS = -version-info 1:0:0 -libbrush_gl_la_SOURCES = gl_model_brush.c model_brush.c - -libbrush_sw_la_LDFLAGS = -version-info 1:0:0 -libbrush_sw_la_SOURCES = sw_model_brush.c model_brush.c - -libbrush_sw32_la_LDFLAGS = -version-info 1:0:0 -libbrush_sw32_la_SOURCES = sw32_model_brush.c model_brush.c diff --git a/libs/models/sprite/Makefile.am b/libs/models/sprite/Makefile.am index 2471e5736..38f2dafa2 100644 --- a/libs/models/sprite/Makefile.am +++ b/libs/models/sprite/Makefile.am @@ -1,30 +1,21 @@ INCLUDES= -I$(top_srcdir)/include +noinst_LTLIBRARIES= libsprite_gl.la libsprite_sw.la libsprite_sw32.la + if BUILD_GL -SPRITE_GL = libsprite_gl.la +libsprite_gl_la_SOURCES= gl_model_sprite.c model_sprite.c else -SPRITE_GL = +libsprite_gl_la_SOURCES= endif if BUILD_SW -SPRITE_SW = libsprite_sw.la +libsprite_sw_la_SOURCES= sw_model_sprite.c model_sprite.c else -SPRITE_SW = +libsprite_sw_la_SOURCES= endif if BUILD_SW32 -SPRITE_SW32 = libsprite_sw32.la +libsprite_sw32_la_SOURCES= sw32_model_sprite.c model_sprite.c else -SPRITE_SW32 = +libsprite_sw32_la_SOURCES= endif - -noinst_LTLIBRARIES = $(SPRITE_GL) $(SPRITE_SW) $(SPRITE_SW32) - -libsprite_gl_la_LDFLAGS = -version-info 1:0:0 -libsprite_gl_la_SOURCES = gl_model_sprite.c model_sprite.c - -libsprite_sw_la_LDFLAGS = -version-info 1:0:0 -libsprite_sw_la_SOURCES = sw_model_sprite.c model_sprite.c - -libsprite_sw32_la_LDFLAGS = -version-info 1:0:0 -libsprite_sw32_la_SOURCES = sw32_model_sprite.c model_sprite.c