X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=sidebyside;f=source%2FMakefile.in;h=a2b25c7d501a536f5c7cbfb71c8c8e35953ac652;hb=a117b08db467757f5920a4cc5791f89a3b5d830c;hp=7edf2e021fd8bb94cf1f38cd877ce0c3f943882e;hpb=4e0e172f3b1cb1a1911f43ee0ef11d000c79b038;p=xestiaab%2F.git

diff --git a/source/Makefile.in b/source/Makefile.in
index 7edf2e0..a2b25c7 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1,6 +1,7 @@
 CPP=g++
 STRIP=strip
-CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags --libs` `curl-config --libs` -lmagic -lsfml-audio -lxml2 -std=c++11 @DBGOUT@
+CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 @DBGOUT@
+CPPLIBS=`wx-config --libs` `curl-config --libs` -lsfml-audio -lxml2
 
 @DBGSTATUS@
 XAB_OUT=xestiaab
@@ -96,7 +97,8 @@ BMCOOBJS=tools/bitmapcode.o
 xestiaab: bitmaphelper formobjs widgetobjs commonobjs vcardobjs carddavobjs \
 	ceobjs mainobjs searchobjs imexobjs 
 	$(CPP) $(CPPFLAGS) $(FORMOBJS) $(WIDGETOBJS) $(COMMONOBJS) \
-	$(VCARDOBJS) $(CEOBJS) $(CARDDAVOBJS) $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT)
+	$(VCARDOBJS) $(CEOBJS) $(CARDDAVOBJS) $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT) \
+	$(CPPLIBS)
 ifeq ($(DEBUG), false)
 	$(STRIP) -s $(XAB_OUT)
 endif
@@ -133,7 +135,7 @@ distclean: clean
 bitmaphelperobjs: $(BMCOOBJS)
 
 bitmaphelper: bitmaphelperobjs
-	$(CPP) $(CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP)
+	$(CPP) $(CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP) $(CPPLIBS)
 	$(BMCO_HELP) bitmaps/
 
 install: