Keep Libs and Cflags together to maintain ordering

Instead of splitting to -l/-L/other and -I/other, keep the args together
and mark each argument with its type. Then we can maintain order all the
way through.

1 files changed, 9 insertions, 5 deletions

diff --git a/pkg.h b/pkg.h
index a28c406..95c114a 100644
--- a/pkg.h
+++ b/pkg.h
@@ -45,9 +45,16 @@ typedef enum
   ALWAYS_MATCH
 } ComparisonType;
 
+typedef struct _Flag Flag;
 typedef struct _Package Package;
 typedef struct _RequiredVersion RequiredVersion;
 
+struct _Flag
+{
+  FlagType type;
+  char *arg;
+};
+
 struct _RequiredVersion
 {
   char *name;
@@ -68,11 +75,8 @@ struct _Package
   GList *requires;
   GList *requires_private_entries;
   GList *requires_private;
-  GList *l_libs;
-  GList *L_libs;
-  GList *other_libs;
-  GList *I_cflags;
-  GList *other_cflags;
+  GList *libs;
+  GList *cflags;
   GHashTable *vars;
   GHashTable *required_versions; /* hash from name to RequiredVersion */
   GList *conflicts; /* list of RequiredVersion */