projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove glib-config-2.0
[platform/upstream/glib.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
dd0a2e5
..
fbd8d83
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-4,11
+4,8
@@
AUTOMAKE_OPTIONS = 1.4
SUBDIRS = . gobject gmodule gthread docs tests build
SUBDIRS = . gobject gmodule gthread docs tests build
-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 = \
ChangeLog.pre-1-2 \
EXTRA_DIST = \
ChangeLog.pre-1-2 \
@@
-19,23
+16,30
@@
EXTRA_DIST = \
README.win32 \
TODO.xml \
glib.def \
README.win32 \
TODO.xml \
glib.def \
- makefile.msc \
makefile.msc.in \
makefile.msc.in \
- makefile.mingw \
makefile.mingw.in \
giowin32.c \
makefile.mingw.in \
giowin32.c \
- glibconfig.h.win32 \
glibconfig.h.win32.in \
gwin32.c \
glibconfig.h.win32.in \
gwin32.c \
- config.h.win32 \
+ gspawn-win32.c \
+ gspawn-win32-helper.c \
config.h.win32.in \
build-dll \
config.h.win32.in \
build-dll \
- glib.rc \
glib.rc.in \
glib-2.0.pc.in \
gobject-2.0.pc.in \
gmodule-2.0.pc.in \
glib.rc.in \
glib-2.0.pc.in \
gobject-2.0.pc.in \
gmodule-2.0.pc.in \
- gthread-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.spec
lib_LTLIBRARIES = libglib-1.3.la
lib_LTLIBRARIES = libglib-1.3.la
@@
-56,10
+60,12
@@
libglib_1_3_la_SOURCES = \
giounix.c \
glist.c \
gmain.c \
giounix.c \
glist.c \
gmain.c \
+ gmarkup.c \
gmem.c \
gmessages.c \
gnode.c \
gprimes.c \
gmem.c \
gmessages.c \
gnode.c \
gprimes.c \
+ gqsort.c \
gqueue.c \
grel.c \
grand.c \
gqueue.c \
grel.c \
grand.c \
@@
-75,11
+81,15
@@
libglib_1_3_la_SOURCES = \
gtree.c \
guniprop.c \
gutf8.c \
gtree.c \
guniprop.c \
gutf8.c \
+ gunibreak.h \
+ gunibreak.c \
gunichartables.h \
gunidecomp.h \
gunidecomp.c \
gunichartables.h \
gunidecomp.h \
gunidecomp.c \
- gutils.c \
- @ALLOCA@
+ gutils.c
+
+## 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 = \
glibincludedir=$(includedir)/glib-2.0
glibinclude_HEADERS = \
@@
-88,6
+98,7
@@
glibinclude_HEADERS = \
gasyncqueue.h \
gbacktrace.h \
gcache.h \
gasyncqueue.h \
gbacktrace.h \
gcache.h \
+ gcompat.h \
gcompletion.h \
gconvert.h \
gdataset.h \
gcompletion.h \
gconvert.h \
gdataset.h \
@@
-102,10
+113,12
@@
glibinclude_HEADERS = \
glist.h \
gmacros.h \
gmain.h \
glist.h \
gmacros.h \
gmain.h \
+ gmarkup.h \
gmem.h \
gmessages.h \
gnode.h \
gprimes.h \
gmem.h \
gmessages.h \
gnode.h \
gprimes.h \
+ gqsort.h \
gquark.h \
gqueue.h \
grand.h \
gquark.h \
gqueue.h \
grand.h \
@@
-122,7
+135,8
@@
glibinclude_HEADERS = \
gtree.h \
gtypes.h \
gunicode.h \
gtree.h \
gtypes.h \
gunicode.h \
- gutils.h
+ gutils.h \
+ gwin32.h
configexecincludedir = $(libdir)/glib-2.0/include
#configexecinclude_DATA = glibconfig.h
configexecincludedir = $(libdir)/glib-2.0/include
#configexecinclude_DATA = glibconfig.h
@@
-143,14
+157,17
@@
stamp-gc-h: config.status
CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status
echo timestamp > stamp-gc-h
CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status
echo timestamp > stamp-gc-h
+libglib_1_3_la_LIBADD = @ICONV_LIBS@
+
libglib_1_3_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic
libglib_1_3_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic
-noinst_PROGRAMS = testglib testgdate testgdateparser
+noinst_PROGRAMS = testglib testgdate testgdateparser
timeloop
testglib_LDADD = libglib-1.3.la
testgdate_LDADD = libglib-1.3.la
testgdateparser_LDADD = libglib-1.3.la
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-2.0.m4
m4datadir = $(datadir)/aclocal
m4data_DATA = glib-2.0.m4
@@
-194,5
+211,8
@@
snapshot:
snapcheck:
$(MAKE) distcheck 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