AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = . gobject gmodule gthread docs tests
+SUBDIRS = . gobject gmodule gthread docs tests build
-bin_SCRIPTS=glib-config
-BUILT_SOURCES=glib-config
-glib-config: glib-config.in
+bin_SCRIPTS=glib-config-2.0
+BUILT_SOURCES=glib-config-2.0
+glib-config-2.0: glib-config-2.0.in
-INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
+INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
+ -DG_DISABLE_COMPAT_H
-EXTRA_DIST = \
- glib.m4 \
+EXTRA_DIST = \
+ ChangeLog.pre-1-2 \
+ glib-2.0.m4 \
glib.spec.in \
acglib.m4 \
sanity_check \
README.win32 \
+ TODO.xml \
glib.def \
- makefile.msc \
makefile.msc.in \
- makefile.cygwin \
- makefile.cygwin.in \
+ makefile.mingw.in \
giowin32.c \
- glibconfig.h.win32 \
glibconfig.h.win32.in \
gwin32.c \
- config.h.win32 \
+ gspawn-win32.c \
+ gspawn-win32-helper.c \
config.h.win32.in \
build-dll \
+ glib.rc.in \
+ glib-2.0.pc.in \
+ gobject-2.0.pc.in \
+ gmodule-2.0.pc.in \
+ gthread-2.0.pc.in \
+ gen-unicode-tables.pl
+
+# These may be in the builddir too
+BUILT_EXTRA_DIST = \
+ makefile.msc \
+ makefile.mingw \
+ glibconfig.h.win32 \
+ config.h.win32 \
glib.rc \
- glib.rc.in
-
-lib_LTLIBRARIES = libglib.la
-
-libglib_la_SOURCES = \
- garray.c \
- gasyncqueue.c \
- gcache.c \
- gcompletion.c \
- gdataset.c \
- gdate.c \
- gerror.c \
- ghash.c \
- ghook.c \
- giochannel.c \
- giounix.c \
- glist.c \
- gmain.c \
- gmem.c \
- gmessages.c \
- gnode.c \
- gprimes.c \
- gqueue.c \
- grel.c \
- grand.c \
- gscanner.c \
- gslist.c \
- gstrfuncs.c \
- gstring.c \
- gthread.c \
- gthreadpool.c \
- gtimer.c \
- gtree.c \
+ glib.spec
+
+lib_LTLIBRARIES = libglib-1.3.la
+
+libglib_1_3_la_SOURCES = \
+ garray.c \
+ gasyncqueue.c \
+ gbacktrace.c \
+ gcache.c \
+ gcompletion.c \
+ gconvert.c \
+ gdataset.c \
+ gdate.c \
+ gerror.c \
+ gfileutils.c \
+ ghash.c \
+ ghook.c \
+ giochannel.c \
+ giounix.c \
+ glist.c \
+ gmain.c \
+ gmarkup.c \
+ gmem.c \
+ gmessages.c \
+ gnode.c \
+ gprimes.c \
+ gqsort.c \
+ gqueue.c \
+ grel.c \
+ grand.c \
+ gscanner.c \
+ gshell.c \
+ gslist.c \
+ gspawn.c \
+ gstrfuncs.c \
+ gstring.c \
+ gthread.c \
+ gthreadpool.c \
+ gtimer.c \
+ gtree.c \
+ guniprop.c \
+ gutf8.c \
+ gunibreak.h \
+ gunibreak.c \
+ gunichartables.h \
+ gunidecomp.h \
+ gunidecomp.c \
gutils.c
-include_HEADERS = glib.h glib-object.h
-
-configexecincludedir = $(pkglibdir)/include
+## If we decide to link in 'alloca.c', this is how to do it
+#libglib_1_3_la_LIBADD = @ALLOCA@
+
+glibincludedir=$(includedir)/glib-2.0
+glibinclude_HEADERS = \
+ galloca.h \
+ garray.h \
+ gasyncqueue.h \
+ gbacktrace.h \
+ gcache.h \
+ gcompat.h \
+ gcompletion.h \
+ gconvert.h \
+ gdataset.h \
+ gdate.h \
+ gerror.h \
+ gfileutils.h \
+ ghash.h \
+ ghook.h \
+ giochannel.h \
+ glib.h \
+ glib-object.h \
+ glist.h \
+ gmacros.h \
+ gmain.h \
+ gmarkup.h \
+ gmem.h \
+ gmessages.h \
+ gnode.h \
+ gprimes.h \
+ gqsort.h \
+ gquark.h \
+ gqueue.h \
+ grand.h \
+ grel.h \
+ gscanner.h \
+ gshell.h \
+ gslist.h \
+ gspawn.h \
+ gstrfuncs.h \
+ gstring.h \
+ gthread.h \
+ gthreadpool.h \
+ gtimer.h \
+ gtree.h \
+ gtypes.h \
+ gunicode.h \
+ gutils.h \
+ gwin32.h
+
+configexecincludedir = $(libdir)/glib-2.0/include
#configexecinclude_DATA = glibconfig.h
install-exec-local: glibconfig.h
if test -r $$file && cmp -s glibconfig.h $$file; then :; \
else $(INSTALL_DATA) glibconfig.h $$file; fi
-configure: configure.in acglib.m4
+CONFIGURE_DEPENDENCIES = acglib.m4
BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
glibconfig.h: stamp-gc-h
CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status
echo timestamp > stamp-gc-h
-libglib_la_LDFLAGS = \
+libglib_1_3_la_LIBADD = @ICONV_LIBS@
+
+libglib_1_3_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) \
-export-dynamic
-noinst_PROGRAMS = testglib testgdate testgdateparser
-testglib_LDADD = libglib.la
-testgdate_LDADD = libglib.la
-testgdateparser_LDADD = libglib.la
+noinst_PROGRAMS = testglib testgdate testgdateparser timeloop
+testglib_LDADD = libglib-1.3.la
+testgdate_LDADD = libglib-1.3.la
+testgdateparser_LDADD = libglib-1.3.la
+timeloop_LDADD = libglib-1.3.la
m4datadir = $(datadir)/aclocal
-m4data_DATA = glib.m4
+m4data_DATA = glib-2.0.m4
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gthread-2.0.pc
glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
makefile.msc: $(top_builddir)/config.status $(top_srcdir)/makefile.msc.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-makefile.cygwin: $(top_builddir)/config.status $(top_srcdir)/makefile.cygwin.in
+makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
glib.rc: $(top_builddir)/config.status $(top_srcdir)/glib.rc.in
./sanity_check $(VERSION)
snapshot:
- $(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+
+snapcheck:
+ $(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
-dist-hook:
- cp glib.spec $(distdir)
+dist-hook: $(BUILT_EXTRA_DIST)
+ files='$(BUILT_EXTRA_DIST)'; \
+ for f in $$files; do \
+ if test -f $$f; then d=.; else d=$(srcdir); fi; \
+ cp $$d/$$f $(distdir) || exit 1; done
projects / platform / upstream / glib.git / blobdiff