c95c1fc989
- Must link with -lfontconfig too, fix build. OBS-URL: https://build.opensuse.org/request/show/80147 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/icewm?expand=0&rev=17
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
--- src/Makefile.in.orig
|
|
+++ src/Makefile.in
|
|
@@ -37,9 +37,9 @@ DEFS = @DEFS@ \
|
|
CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
|
|
@CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
|
|
LFLAGS = @LDFLAGS@
|
|
-LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs`
|
|
+LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs`
|
|
|
|
-CORE_LIBS = @CORE_LIBS@ # `fc-config --libs`
|
|
+CORE_LIBS = @CORE_LIBS@ `pkg-config fontconfig --libs`
|
|
IMAGE_LIBS = @IMAGE_LIBS@
|
|
AUDIO_LIBS = @AUDIO_LIBS@
|
|
GNOME1_LIBS = @GNOME1_LIBS@
|
|
@@ -207,29 +207,29 @@ clean:
|
|
|
|
%.o: %.cc
|
|
@echo " CXX " $@
|
|
- @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
|
|
+ $(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
|
|
|
|
$(BINARIES):
|
|
@echo " LD " $@
|
|
- @$(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS)
|
|
+ $(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS)
|
|
|
|
genpref.o: genpref.cc
|
|
@echo " HOSTCXX " $@
|
|
- @$(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $<
|
|
+ $(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $<
|
|
|
|
genpref$(EXEEXT):
|
|
@echo " HOSTLD " $@
|
|
- @$(HOSTLD) -o $@ $(genpref_OBJS)
|
|
+ $(HOSTLD) -o $@ $(genpref_OBJS)
|
|
|
|
################################################################################
|
|
|
|
gnome.o: gnome.cc
|
|
@echo " CXX " $@
|
|
- @$(CXX) $(CXXFLAGS) @GNOME1_CFLAGS@ $(GCCDEP) -c $<
|
|
+ $(CXX) $(CXXFLAGS) @GNOME1_CFLAGS@ $(GCCDEP) -c $<
|
|
|
|
gnome2.o: gnome2.cc
|
|
@echo " CXX " $@
|
|
- @$(CXX) $(CXXFLAGS) @GNOME2_CFLAGS@ $(GCCDEP) -c $<
|
|
+ $(CXX) $(CXXFLAGS) @GNOME2_CFLAGS@ $(GCCDEP) -c $<
|
|
|
|
################################################################################
|
|
|