Move ffglib.h to inc

fontforge · Sep 19, 2017 · 4bd1bda · 4bd1bda
1 parent bd877b5
commit 4bd1bda
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 19 deletions.
diff --git a/fontforge/Makefile.am b/fontforge/Makefile.am
@@ -104,7 +104,7 @@ pkginclude_HEADERS = autowidth2.h configure-fontforge.h fontforge.h		\
 	uiinterface.h bezctx_ff.h edgelist.h groups.h nonlineartrans.h		\
 	sd.h unicoderange.h bitmapcontrol.h encoding.h ofl.h search.h		\
 	usermenu.h fffreetype.h PfEd.h sfd1.h ffpython.h			\
-	plugins.h sflayoutP.h print.h splinefont.h cvruler.h ffglib.h           \
+	plugins.h sflayoutP.h print.h splinefont.h cvruler.h           \
 	flaglist.h \
 	glif_name_hash.h \
 	glyphcomp.h \

diff --git a/fontforge/autotrace.c b/fontforge/autotrace.c
@@ -52,7 +52,7 @@
 #include <errno.h>		/* for errors */
 #include <dirent.h>		/* for opendir,etc. */
 
-#include "ffglib.h"
+#include <ffglib.h>
 
 int preferpotrace = false;
 

diff --git a/fontforge/baseviews.h b/fontforge/baseviews.h
@@ -27,7 +27,7 @@
 #ifndef _BASEVIEWS_H
 #define _BASEVIEWS_H
 
-#include "ffglib.h"
+#include <ffglib.h>
 #include "splinefont.h"
 
 #define free_with_debug(x) { fprintf(stderr,"%p FREE()\n",x); free(x); }

diff --git a/fontforge/collabclientpriv.h b/fontforge/collabclientpriv.h
@@ -64,7 +64,7 @@ extern int DEBUG_SHOW_SFD_CHUNKS; // defined in collabclient.c
 #define beacon_announce_fontname_sz     40
 
 
-#include "ffglib.h"
+#include <ffglib.h>
 #include "inc/fontforge-config.h"
 #include "inc/ustring.h"
 #include "collabclient.h"

diff --git a/fontforge/encoding.c b/fontforge/encoding.c
@@ -49,7 +49,7 @@
 #include "plugins.h"
 #include "encoding.h"
 #include "psfont.h"
-#include "ffglib.h"
+#include <ffglib.h>
 #include <glib/gprintf.h>
 #include "xvasprintf.h"
 

diff --git a/fontforge/featurefile.c b/fontforge/featurefile.c
@@ -54,7 +54,7 @@
 #include <ustring.h>
 #include <locale.h>
 
-#include "ffglib.h"
+#include <ffglib.h>
 
 /* Adobe's opentype feature file */
 /* Which suffers incompatible changes according to Adobe's whim */

diff --git a/fontforge/fontforgeui.h b/fontforge/fontforgeui.h
@@ -28,7 +28,7 @@
 #define _PFAEDITUI_H_
 
 #include <fontforge-config.h>
-#include "ffglib.h"
+#include <ffglib.h>
 #include "fontforgevw.h"
 #include <gprogress.h>
 

diff --git a/fontforge/python.c b/fontforge/python.c
@@ -115,7 +115,7 @@ extern int old_sfnt_flags;
 #include "collab/zmq_kvmsg.h"
 #endif
 #include "collabclient.h"
-#include "ffglib.h"
+#include <ffglib.h>
 
 extern int prefRevisionsToRetain;
 

diff --git a/fontforge/views.h b/fontforge/views.h
@@ -31,7 +31,7 @@
 
 #include "ttfinstrs.h"
 
-#include "ffglib.h"
+#include <ffglib.h>
 #include "baseviews.h"
 
 #include <ggadget.h>

diff --git a/fontforgeexe/collabclientui.c b/fontforgeexe/collabclientui.c
@@ -32,7 +32,7 @@
 #include "cvundoes.h"
 #include "sfd.h"
 #include "sfundo.h"
-#include "../fontforge/ffglib.h"
+#include <ffglib.h>
 #include "fontforgeexe.h"
 
 int  collabclient_setHaveLocalServer( int v );

diff --git a/fontforgeexe/displayfonts.c b/fontforgeexe/displayfonts.c
@@ -24,7 +24,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "ffglib.h"
+#include <ffglib.h>
 
 #include "autotrace.h"
 #include "cvundoes.h"

diff --git a/fontforgeexe/fontview.c b/fontforgeexe/fontview.c
@@ -59,7 +59,7 @@
 #include <gio.h>
 #include <gresedit.h>
 #include <ustring.h>
-#include "../fontforge/ffglib.h"
+#include <ffglib.h>
 #include <gkeysym.h>
 #include <utype.h>
 #include <chardata.h>

diff --git a/fontforgeexe/pythonui.c b/fontforgeexe/pythonui.c
@@ -29,7 +29,7 @@
 // to get asprintf() defined from stdio.h on GNU platforms
 #define _GNU_SOURCE 1
 
-#include "ffglib.h"
+#include <ffglib.h>
 
 #include <fontforge-config.h>
 

diff --git a/fontforgeexe/startui.c b/fontforgeexe/startui.c
@@ -25,7 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ffglib.h"
+#include <ffglib.h>
 
 #include <fontforge-config.h>
 #include "autosave.h"

diff --git a/fontforgeexe/wordlistparser.h b/fontforgeexe/wordlistparser.h
@@ -30,7 +30,7 @@
 #define _ALREADY_INCLUDED_FF_WORDLIST_PARSER_H
 
 #include "splinefont.h"
-#include "ffglib.h"
+#include <ffglib.h>
 
 const char* Wordlist_getSCName( SplineChar* sc );
 

diff --git a/gdraw/gaskdlg.c b/gdraw/gaskdlg.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "ustring.h"
-#include "ffglib.h"
+#include <ffglib.h>
 #include <glib/gprintf.h>
 #include "gdraw.h"
 #include "gwidget.h"

diff --git a/gdraw/gmatrixedit.c b/gdraw/gmatrixedit.c
@@ -32,7 +32,7 @@
 #include "gresource.h"
 #include <string.h>
 #include <ustring.h>
-#include "../fontforge/ffglib.h"
+#include <ffglib.h>
 #include <glib/gprintf.h>
 #include "xvasprintf.h"
 

diff --git a/gutils/unicodelibinfo.c b/gutils/unicodelibinfo.c
@@ -33,7 +33,7 @@
 
 #include "unicodelibinfo.h"
 #include <ustring.h>
-#include "../fontforge/ffglib.h"
+#include <ffglib.h>
 #include <glib/gprintf.h>
 #include "xvasprintf.h"
 

diff --git a/inc/Makefile.am b/inc/Makefile.am
@@ -36,7 +36,8 @@ DISTCLEANFILES=fontforge-config.h stamp-h1 stamp-h2
 pkginclude_HEADERS = basics.h chardata.h charset.h dynamic.h	\
 	fileutil.h gdraw.h gfile.h ggadget.h gicons.h gimage.h gio.h		\
 	gkeysym.h gprogress.h gresedit.h gresource.h gwidget.h gwwiconv.h	\
-	intl.h ustring.h utype.h dlist.h carbon.h gnetwork.h gutils.h
+	intl.h ustring.h utype.h dlist.h carbon.h gnetwork.h gutils.h		\
+	ffglib.h
 
 nodist_pkginclude_HEADERS = fontforge-config.h
 noinst_HEADERS = pluginloading.h

diff --git a/fontforge/ffglib.h → inc/ffglib.h b/fontforge/ffglib.h → inc/ffglib.h