Don't uselessly include static libraries in other static libraries.

Saves ~14 MB of diskspace when building.
Warzone2100 · May 1, 2011 · a8d88d8 · a8d88d8
1 parent 7bfeb3e
commit a8d88d8
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 18 deletions.
diff --git a/lib/gamelib/Makefile.am b/lib/gamelib/Makefile.am
@@ -39,6 +39,3 @@ libgamelib_a_SOURCES = \
 	audp_parser.tab.c \
 	gtime.c \
 	hashtable.c
-
-libgamelib_a_LIBADD = $(top_builddir)/lib/ivis_opengl/libivis_opengl.a \
-	$(top_builddir)/lib/ivis_common/libivis_common.a $(top_builddir)/lib/framework/libframework.a
diff --git a/lib/ivis_common/Makefile.am b/lib/ivis_common/Makefile.am
@@ -31,5 +31,3 @@ libivis_common_a_SOURCES = \
 	pieclip.c \
 	piestate.c \
 	png_util.c
-
-libivis_common_a_LIBADD = $(top_builddir)/lib/framework/libframework.a
diff --git a/lib/ivis_opengl/Makefile.am b/lib/ivis_opengl/Makefile.am
@@ -26,9 +26,6 @@ libivis_opengl_a_SOURCES += GLee.c
 noinst_HEADERS += GLee.h
 endif
 
-libivis_opengl_a_LIBADD = $(top_builddir)/lib/ivis_common/libivis_common.a \
-	$(top_builddir)/lib/framework/libframework.a
-
 # HACK Don't give make errors when switching between trunk and branches.
 # Works by finding the .deps/*.Po files which refer to source files that don't exist, and replacing them with a single dependency on the correct source file.
 # Now with PD-ksh support.

diff --git a/lib/netplay/Makefile.am b/lib/netplay/Makefile.am
@@ -16,8 +16,6 @@ libnetplay_a_SOURCES = \
 	netplay.c \
 	nettypes.c
 
-libnetplay_a_LIBADD = $(top_builddir)/lib/framework/libframework.a $(top_builddir)/lib/netplay/miniupnpc/libminiupnpc.a
-
 # HACK Don't give make errors when switching between trunk and branches.
 # Works by finding the .deps/*.Po files which refer to source files that don't exist, and replacing them with a single dependency on the correct source file.
 # Now with PD-ksh support.

diff --git a/lib/script/Makefile.am b/lib/script/Makefile.am
@@ -54,5 +54,3 @@ libscript_a_SOURCES = \
 	script_lexer.lex.c \
 	script_parser.tab.c \
 	stack.c
-
-libscript_a_LIBADD = $(top_builddir)/lib/framework/libframework.a
diff --git a/lib/sound/Makefile.am b/lib/sound/Makefile.am
@@ -24,6 +24,3 @@ libsound_a_SOURCES = \
 	openal_track.c \
 	playlist.c \
 	track.c
-
-libsound_a_LIBADD = $(top_builddir)/lib/gamelib/libgamelib.a \
-	$(top_builddir)/lib/framework/libframework.a
diff --git a/lib/widget/Makefile.am b/lib/widget/Makefile.am
@@ -26,6 +26,3 @@ libwidget_a_SOURCES = \
 	slider.c \
 	tip.c \
 	widget.c
-
-libwidget_a_LIBADD = $(top_builddir)/lib/ivis_opengl/libivis_opengl.a \
-	$(top_builddir)/lib/ivis_common/libivis_common.a $(top_builddir)/lib/framework/libframework.a