Updated build system to look for file and support for more Linux-based OSes.

[xestiaab/.git] / source / Makefile.in

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