diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makemodule.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Makemodule.am b/src/Makemodule.am index c9e41ec..2fd5891 100644 --- a/src/Makemodule.am +++ b/src/Makemodule.am | |||
@@ -25,6 +25,8 @@ | |||
25 | BUILT_SOURCES = src/defaults.hh src/defaults.cc | 25 | BUILT_SOURCES = src/defaults.hh src/defaults.cc |
26 | CONFIG_CLEAN_FILES = src/defaults.hh src/defaults.cc | 26 | CONFIG_CLEAN_FILES = src/defaults.hh src/defaults.cc |
27 | 27 | ||
28 | LDADD = libFbTk.a src/defaults.$(OBJEXT) | ||
29 | |||
28 | bin_PROGRAMS += fluxbox | 30 | bin_PROGRAMS += fluxbox |
29 | 31 | ||
30 | src/defaults.hh: | 32 | src/defaults.hh: |
@@ -138,13 +140,13 @@ fluxbox_CPPFLAGS = \ | |||
138 | -I$(fbtk_incdir) \ | 140 | -I$(fbtk_incdir) \ |
139 | -I$(nls_incdir) | 141 | -I$(nls_incdir) |
140 | 142 | ||
141 | fluxbox_LDFLAGS = \ | 143 | fluxbox_LDADD = \ |
144 | $(LDADD) \ | ||
142 | $(FONTCONFIG_LIBS) \ | 145 | $(FONTCONFIG_LIBS) \ |
143 | $(FREETYPE2_LIBS) \ | 146 | $(FREETYPE2_LIBS) \ |
144 | $(FRIBIDI_LIBS) \ | 147 | $(FRIBIDI_LIBS) \ |
145 | $(IMLIB2_LIBS) \ | 148 | $(IMLIB2_LIBS) \ |
146 | $(RANDR_LIBS) \ | 149 | $(RANDR_LIBS) \ |
147 | $(X11_LIBS) \ | ||
148 | $(XEXT_LIBS) \ | 150 | $(XEXT_LIBS) \ |
149 | $(XFT_LIBS) \ | 151 | $(XFT_LIBS) \ |
150 | $(XINERAMA_LIBS) \ | 152 | $(XINERAMA_LIBS) \ |
@@ -152,7 +154,8 @@ fluxbox_LDFLAGS = \ | |||
152 | $(XRENDER_LIBS) \ | 154 | $(XRENDER_LIBS) \ |
153 | $(X_EXTRA_LIBS) \ | 155 | $(X_EXTRA_LIBS) \ |
154 | $(X_LIBS) \ | 156 | $(X_LIBS) \ |
155 | $(X_PRE_LIBS) | 157 | $(X_PRE_LIBS) \ |
158 | $(X11_LIBS) | ||
156 | 159 | ||
157 | fluxbox_SOURCES = \ | 160 | fluxbox_SOURCES = \ |
158 | src/AlphaMenu.cc \ | 161 | src/AlphaMenu.cc \ |
@@ -272,4 +275,3 @@ fluxbox_SOURCES = \ | |||
272 | ${SLIT_SOURCE} \ | 275 | ${SLIT_SOURCE} \ |
273 | ${TOOLBAR_SOURCE} | 276 | ${TOOLBAR_SOURCE} |
274 | 277 | ||
275 | LDADD = libFbTk.a src/defaults.$(OBJEXT) | ||